blaj
Merge branch 'master' of https://github.com/mikaelrosquist/CinemApp

Conflicts:
	CinemApp/ProfileViewController.m