new
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