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

Conflicts:
	Resources/iphone/alloy/controllers/settings/index.js
	Resources/iphone/alloy/controllers/tmp/hot/castDetail/index.js
	Resources/iphone/alloy/controllers/tmp/hot/index.js