Added some model tests
Deleted commented code.
Merge remote-tracking branch 'origin/master' into tests_adding
Merge pull request #1 from s1mplex/tests_adding

Tests adding
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
Merge remote-tracking branch 'origin/master' into feature/adding_shows_backend

Conflicts:
	app/models/screen.rb
	spec/models/screen_spec.rb
Grrrr merge conflicts