Extra Commit?
Merge branch 'gh-pages'

Conflicts:

platforms/ios/avfDemo.xcodeproj/project.xcworkspace/xcuserdata/shaungill
espie.xcuserdatad/UserInterfaceState.xcuserstate
Android Skeleton
Merge branch 'master' into gh-pages