fixed map bugs, fixed visual style on firefox
fixed map bugs, fixed visual style on firefox
Merge branch 'master' of github.com:studyspace4me/website

Conflicts:
	website/static/.sass-cache/df5c6ddff57557ee96457fa58db7e9ee0512823c/dashboard.scssc
	website/static/css/dashboard.css
	website/static/css/layout.css
fixed map bugs, fixed visual style on firefox