removed conditions that prevented sidebar btn functionality
fixed bugs in js
bug fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/map.js