revert previous commit, feature will be back
Merge branch 'develop' of https://github.com/capensis/canopsis into develop
Merge branch 'develop' of https://github.com/capensis/canopsis into develop
Merge branch 'develop' of https://github.com/capensis/canopsis into develop
small fixes
Merge branch 'develop' of https://github.com/capensis/canopsis into develop