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

Conflicts:
	CinemApp/CinemApp/Base.lproj/Main.storyboard