sidebar added
Merge branch 'master' into develop

Conflicts:
	app/assets/javascripts/map.js