New start
Merge branch 'master' of https://github.com/FortPinnsvin/Travel

Conflicts:
	src/assets/js/app/map.js