merge
refactor all movies into get movies data service
Merge branch 'master' of https://github.com/MovieBuddy/moviebuddy

Conflicts:
	app/scripts/app.js
Merge branch 'master' of https://github.com/MovieBuddy/moviebuddy

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/movies.js
Merge branch 'master' of https://github.com/JoshSGman/moviebuddy_ into JoshSGman-master

Conflicts:
	app/scripts/controllers/movies.js