Combined the js assets with the theme assets (as requested per @pjackson28)
Merge pull request #3650 from LaurentGoderre/v4-combine-assets

Combined the js assets with the theme assets