Merge pull request #1 from Meet-Up/js_refactoring

Js refactoring
Merge branch 'master' into integration_tools