Merge branch 'master' of github.com:jumpingnuts/ssul-it-client-web
Merge branch 'js_hotfix'