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

Conflicts:
	MessageMe/ADRegistrationViewController.m