Moved tour.json into static config
Merge branch 'custommap' of github.com:MariusSchmidt/Schreibwerkstatt into custommap

Conflicts:
	www/js/controllers.js
	www/tour.json