small fixes
Merge branch 'master' of github.com:prellele/movieMS

Conflicts:
	app/controllers/movies_controller.rb