refactored loader, avoid complex code
Merge branch 'master' of https://github.com/capensis/canopsis-webcore into api-new-rights