Updates
Merge branch 'master' of https://github.com/boydlee/Movies

Conflicts:
	Resources/alloy/controllers/index.js
	Resources/alloy/styles/index.js