Commit 2014 03 07e

More changes
Merge branch 'master' of https://github.com/TomTYG/So-Selfie

Conflicts:
	soselfie/soselfie/View/RatingButtonsViewController.m