v7.3.4

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

Conflicts:
	Resources/iphone/alloy/controllers/index.js
	Resources/iphone/alloy/controllers/look.js
	Resources/iphone/alloy/controllers/trend.js
	Resources/iphone/alloy/controllers/webBrowser.js
	Resources/iphone/alloy/styles/article.js
	Resources/iphone/alloy/styles/diy.js
	Resources/iphone/alloy/styles/index.js
	Resources/iphone/alloy/styles/look.js
	Resources/iphone/alloy/styles/trend.js
	Resources/iphone/alloy/styles/webBrowser.js