registration
Merge branch 'master' of https://github.com/appdios/testapp

Conflicts:
	MessageMe.xcodeproj/project.pbxproj
	MessageMe.xcodeproj/project.xcworkspace/xcshareddata/MessageMe.xccheckout