spalsher
Merge branch 'master' of https://github.com/patrickmueller/AtlasDerSchweiz

Conflicts:
	js/map.js