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

Conflicts:
	Resources/iphone/app.js