Merge branch 'flotcharts' into flotchart-downtimes
Merge branch 'develop' into flotchart-downtimes
typo: trailing spaces
downtime uses crecord dispatcher
typo: trailing spaces
Merge branch 'develop' of https://github.com/capensis/canopsis into develop
ack optimizations, put ack to check in RAM cache instead systematic query db
Merge branch 'develop' of https://github.com/capensis/canopsis into develop

Conflicts:
	sources/canolibs/lib/canolibs/cengine.py
Merge branch 'develop' into downtime-ack_opimizations
fix: catch an exception which is raised when perfdata2 doesn't exist in perfdata2_bin collections but exist in perfdata2 collection
fix key missing log error performance issues
fix: resolve scope reference in clogging when a new scope is given
fix: remove all references from logging branch
Merge branch 'flotchart-downtimes' into develop

Conflicts:
	sources/externals
fix: remove completely clogging from develop
typo:trailing spaces
fix label display on pie(category) graph
Merge branch 'develop' into downtime-ack_opimizations

Conflicts:
	sources/canolibs/lib/canolibs/camqp.py
	sources/canolibs/lib/canolibs/cengine.py
Merge branch 'develop' of github.com:capensis/canopsis into develop
fix minimizer bug for calendar widget