merge
Merge branch 'master' of
https://github.com/markuslamm/urbanstreetart.git

Conflicts:
	application.log