test
Merge branch 'master' of https://github.com/nuumedia/meine_stadt

Conflicts:
	README.txt