7.3.4

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

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/index.js
	Resources/iphone/alloy/styles/look.js
	Resources/iphone/alloy/styles/trend.js
	Resources/iphone/alloy/styles/webBrowser.js