Merge branch 'master' of https://github.com/tlsion/CloudApp

Conflicts:
	CloudApp.xcodeproj/project.xcworkspace/xcshareddata/CloudApp.xccheckout
3.mini