Update unit test
Merge remote-tracking branch 'upstream/master'
Update unit test
Merge pull request #25 from jerv13/master

Update unit test
Update js paths
Merge pull request #26 from jerv13/master

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