Merge pull request #26 from jerv13/master

Update js paths
fix build
Merge remote-tracking branch 'upstream/master' into speedsite