continue navbar
Merge branch 'master' into develop

Conflicts:
	css/storymap-mobile-portrait.css