A project Maquma client iOS
Merge branch 'master' of https://github.com/sadisasha/iMaquma

Conflicts:
	iMaquma/AppDelegate.m
	iMaquma/Base.lproj/iPhone.storyboard
	iMaquma/Controllers/Question/QuestionController.h
	iMaquma/Controllers/Question/QuestionController.m
	iMaquma/Controllers/Registration/RegistrationViewController.m
	iMaquma/Controllers/TabBarController/TabBarController.h
	iMaquma/Controllers/TabBarController/TabBarController.m