js security fix
Merge branch 'master' of https://github.com/capensis/canopsis-webcore
fix merge conflict
Merge branch 'master' of https://github.com/capensis/canopsis-webcore