Final commit for adding verification (js checking)
Merge branch 'js_checking' into dev