github test 2
Merge branch 'master' of github.com:mhabermayer/appsolut-schoenbrunn

Conflicts:
	.DS_Store
	appsolut-schoenbrunn.xcodeproj/project.pbxproj
	appsolut-schoenbrunn.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	appsolut-schoenbrunn.xcodeproj/project.xcworkspace/xcuserdata/Mena.xcuserdatad/UserInterfaceState.xcuserstate
	appsolut-schoenbrunn.xcodeproj/xcuserdata/Mena.xcuserdatad/xcschemes/xcschememanagement.plist