Revert "Javascript refactor"
Merge pull request #29 from TeamCobra/revert-22-javascript_refactor

Revert "Javascript refactor"
Merge branch 'master' into XML-Refactor