updates
Merge branch 'master' into admin_b

Conflicts:
	app/views/movies/index.html.erb
	app/views/movies/show.html.erb
admin stuff added
added admin user powers
Merge branch 'admin_b'