Fix on dataservice bug
Merge branch 'master' of https://github.com/samkomo/TrailerTrail

Conflicts:
	TrailerTrail/Base.lproj/Main.storyboard
	TrailerTrail/FilmDataService.m
	TrailerTrail/ViewController.m
merge