Completed map functionality
Merge branch 'Bettermap' of github.com:MariusSchmidt/Schreibwerkstatt into Bettermap

Conflicts:
	www/js/controllers.js