changes
Merge branch 'master' of https://github.com/kunila/Booie

Conflicts:
	Booie/RegistrationController/RegistrationViewController.m