Fix js load order
Removed JS module dependencies due to broken includes.
formatting
Merge pull request #24 from jerv13/master

Removed JS module dependencies due to broken includes.
Update unit test
Merge remote-tracking branch 'upstream/master'
Update unit test
Merge pull request #25 from jerv13/master

Update unit test