gulpfile fixed
add phonegap/cordova generator
Merge remote-tracking branch 'origin/master'