Merge branch 'map'

Conflicts:
	easygrt/static/easygrt/css/style.css
	easygrt/templates/easygrt/base.html
	easygrt/urls.py
	easygrt/views.py