Merging separate-vendor-file with master
Merging feature/javascript-app-generator with master