Update.
Merge branch 'master' of https://github.com/elpassion/mpg-ios

Conflicts:
	MPG-iOS/ViewControllers/ResultViewController.m