Fixed js + removed userMod class
Merge branch 'master' into add-user-tests