modified
Merge branch 'master' of https://github.com/dannyna/FashionAir

Conflicts:

platforms/ios/FashionAir.xcodeproj/project.xcworkspace/xcuserdata/DANNY.
xcuserdatad/UserInterfaceState.xcuserstate
	platforms/ios/www/css/style.css
	platforms/ios/www/img/01_home/slider_02.jpg
	platforms/ios/www/img/01_home/slider_03.jpg
	platforms/ios/www/img/01_home/slider_05.jpg
	platforms/ios/www/js/controllers.js
	platforms/ios/www/templates/01_home.html
	platforms/ios/www/templates/10_right.html
modified2