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
3 jobs for develop in 11 minutes and 21 seconds (queued for 6 minutes and 16 seconds)
Status Job ID Name Coverage
  Test
passed #160924
node
Static

00:02:29

passed #160923
node ng google-chrome
Tests

00:04:54

73.74%
 
  Deploy
passed #160925
node ng firebase
Deploy Develop

00:03:57