Merge origin/master

Conflicts:
	www/js/mapController.js
	www/templates/map-index.html
Merge origin/master