Merge branch '140-split-the-map-view-navigation-into-two' into 'develop'

Resolve "Split the map-view navigation into two"

Closes #140

See merge request !128
2 jobs for 130-add-pattern-to-rooms-with-pois-for-increased-highlighting in 7 minutes and 50 seconds (queued for 10 minutes and 31 seconds)
latest
Status Job ID Name Coverage
  Test
passed #160929
node
Static

00:02:32

passed #160928
node ng google-chrome
Tests

00:05:17

73.74%