movie controller update
Merge branch 'master' of github.com:9thport/popmovies

Conflicts:
	website/controllers/movie_controller.js
Merge branch 'master' of github.com:9thport/popmovies
Merge branch 'master' of github.com:9thport/popmovies
Merge branch 'master' of github.com:9thport/popmovies
Merge branch 'master' of github.com:9thport/popmovies
change
new update
all done
done