# Conflicts:
#	Makefile
#	analytics/AnalyticsManager.cpp
#	analytics/includes/AnalyzerConfiguratorTemplate.h
#	analytics/includes/AnalyzerTemplate.h
#	collectagent/analyticscontroller.cpp
#	collectagent/collectagent.cpp
#	dcdbpusher/Configuration.h
#	dcdbpusher/HttpsServer.cpp
#	dcdbpusher/MQTTPusher.cpp
#	dcdbpusher/MQTTPusher.h
#	dcdbpusher/config/dcdbpusher.conf
#	dcdbpusher/dcdbpusher.cpp

- Added a catch for an exception thrown when using on-demand analyzers
- Checking that the HTTPS server is actually running before stopping it in
the destructor

- Added documentation to the new SensorID implementation
- NOTE: virtual sensors will likely require some modifications due to
how topics are handled now ('/' separator clashing with divide symbol)

dcdbpusher: New PluginManager class to bundle all plugin related operations. Integration outstanding

- String topics are now used across all of DCDB, up to Cassandra
- As of now, sensor names ALWAYS match MQTT topics
- Users can still define sensor "aliases" via dcdbconfig that point
to the same topics

Common rest server

See merge request !3

- Update config files to reflect new topic structure
- Updated READMEs accordingly
- Added support for "relaxed" analyzers, whose units can be built
even if some sensors cannot be found in the system
- Added support for sub-units, so as to build hierarchical unit structures

CollectAgent should be switched to new Rest API design as soon as possible
Minor improvements to README, Makefile and PUT /analytics/reload methods