Version 5.0
Version 5.1
Merge branch 'master' of https://github.com/s3su/Vlothie_v1.0

Conflicts:
	Resources/iphone/alloy/controllers/article.js
	Resources/iphone/alloy/controllers/home.js
	Resources/iphone/alloy/controllers/index.js
	Resources/iphone/alloy/controllers/look.js
	Resources/iphone/alloy/controllers/settings.js
	Resources/iphone/alloy/controllers/trend.js
	app/views/article.xml