no message
Merge branch 'master' of https://github.com/PeterVdK/JamesBond

Conflicts:
	www/templates/map.html