everything. blabla.
Merge branch 'master' of github.com:MapleCake/maple-cake-ios-app

Conflicts:
	MapleCake.xcodeproj/project.pbxproj
reversed pbxproj