no message
Merge branch 'master' of https://github.com/rcresnik/M3RegistrationManager

Conflicts:
	M3RegistrationManager/M3RegistrationManager.h
	M3RegistrationManager/M3RegistrationManager.m