Merge branch 'master' of github.com:MHDPolska/iOS

Conflicts:
	SocialTrainer/ViewControllers/NewsDetailsViewController.m