Merge branch 'hotfix/jserror'
Merge branch 'master' of github.com:webhat/Working-Title
Updates
merge error in users.tpl fixed
Merge branch 'master' of github.com:webhat/Working-Title into develop
Testing Qbaka