Checkbox
Merge branch 'Enhancement_1'

Conflicts:
	app/views/movies/index.html.haml