update
Merge branch 'master' of https://github.com/logicdesign/movieplus

Conflicts:
	Resources/iphone/alloy/controllers/movieDetail/cast.js
	Resources/iphone/app.js
	Resources/iphone/remoteImage.js
	app/alloy.js
	app/controllers/movieDetail/cast.js
	app/lib/remoteImage.js