cordova/kit kat fixes
Merge branch 'master' of github.com:01org/appframework