testcommit
Merge branch 'master' of https://github.com/StadtGarten/stadtgarten-ios-app

Conflicts:
	StadtgartenApp/SetPictureViewController.m