some changes for leaflet and design
Merge branch 'master' into backend-base-setup

Conflicts:
	project/static/js/map.js
	project/templates/base.html
	src/css/style.css.map