Fixed the project configuration so that we can run the tests.
Fixed the merge.
Merge branch 'storyboard-fix' of https://github.com/intere/HollywoodLegends into storyboard-fix

Conflicts:
	HollywoodLegends.xcodeproj/project.pbxproj