Merge branch 'develop' into livereporting-exclusion

Conflicts:
	sources/webcore/var/www/canopsis/app/lib/view/cwidget.js
remove useless verbosity in cperfstorevalueconsumerwidget
Merge branch 'develop' into livereporting-exclusion

Conflicts:
	sources/webcore/var/www/canopsis/app/lib/view/cperfstoreValueConsumerWidget.js
Merge branch 'livereporting-exclusion' of https://github.com/capensis/canopsis into livereporting-exclusion

Conflicts:
	sources/webcore/var/www/canopsis/app/lib/view/cperfstoreValueConsumerWidget.js