pics
logo
zeug
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/StadtGarten/stadtgarten-ios-app

Conflicts:
	StadtgartenApp.xcodeproj/project.pbxproj
	StadtgartenApp/en.lproj/imag.storyboard