6.21

SS
Merge branch 'master' of https://github.com/suarese1/Vlothie-dev-front

Conflicts:
	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
	Resources/iphone/alloy/styles/article.js
	Resources/iphone/alloy/styles/home.js
	Resources/iphone/alloy/styles/index.js
	Resources/iphone/alloy/styles/look.js
	Resources/iphone/alloy/styles/menuHome.js
	Resources/iphone/alloy/styles/row.js
	Resources/iphone/alloy/styles/settings.js
	Resources/iphone/alloy/styles/trend.js
	app/views/home.xml