Map Update
Merge branch 'master' of https://github.com/TristanKemp/ExeterHackathon

Conflicts:
	frontend/assets/js/map.js