js error fix
Merge branch 'hotfix/jserror'
Merge branch 'master' of github.com:webhat/Working-Title