V7.2.0

JD
Merge branch 'master' of https://github.com/s3su/Vlothie_v1.0

Conflicts:
	Resources/iphone/alloy/controllers/home.js
	Resources/iphone/alloy/controllers/trend.js
	Resources/iphone/alloy/controllers/webBrowser.js
	app/views/trend.xml