adding bundles for javascript development
merging upstream changes