Merge branch 'gh-pages' into dev

Conflicts:

app/platforms/ios/IWorkout2.xcodeproj/project.xcworkspace/xcuserdata/lou
isewhitney.xcuserdatad/UserInterfaceState.xcuserstate
app/platforms/ios/www/css/index.css
app/platforms/ios/www/index.html
app/platforms/ios/www/js/index.js