Merge branch 'master' of https://github.com/stockholmuniversity/hermes into MOB-246

Conflicts:
	assets/www/map/css/mapapp.css
Merge branch 'master' of https://github.com/stockholmuniversity/hermes into MOB-246

Conflicts:
	assets/www/map/css/mapapp.css