commiting
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	ios/ios.xcodeproj/project.xcworkspace/xcuserdata/desiregardner.xcuserdatad/UserInterfaceState.xcuserstate
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	ios/ios.xcodeproj/project.xcworkspace/xcuserdata/desiregardner.xcuserdatad/UserInterfaceState.xcuserstate