New front

frontend
Merge branch 'master' of https://github.com/adambarreiro/watchFire

Conflicts:
	frontend/js/map.js