Modified map layer and navbar
Merge branch 'master' of https://github.com/kamicut/obdeck-website

Conflicts:
	app/scripts/mymap.js
Use ours