Add error reporting to screen modals
Renaming files in order to make karma work properly
Fix seat creation
Merge branch 'adding_screens_bugfixes'
cinema controller tests
Typo fix
Merge remote-tracking branch 'origin/master' into feature/extended_navigation

Conflicts:
	app/controllers/screens_controller.rb