english translation file updated
Merge branch 'develop' of https://github.com/capensis/canopsis into develop
improve: webserver now loads webservices from configuration file
Merge branch 'develop' of github.com:capensis/canopsis into develop
Merge branch 'develop' into engine-scheduler