Controller for water usage trends - App backend
Same thing
:-(
Merge branch 'master' of https://github.com/smartwatermanagement/self-healing-water-networks

Conflicts:
	MonitoringSystem/bin/datasimulator/impl/DataSimulator.class
	MonitoringSystem/bin/datasimulator/sensordatagenerator/SensorDataGenerator.class
	MonitoringSystem/bin/datasimulator/sensordatagenerator/impl/FlowSensorDataGenerator.class
	MonitoringSystem/bin/datasimulator/sensordatagenerator/impl/LevelSensorDataGenerator.class
	MonitoringSystem/bin/datasimulator/sensordatagenerator/impl/QualitySensorDataGenerator.class
	MonitoringSystem/bin/model/Threshold.class
	MonitoringSystem/bin/monitor/Monitor.class
	MonitoringSystem/bin/monitor/components/IIssueTracker.class
	MonitoringSystem/bin/monitor/components/impl/IssueTracker.class
	MonitoringSystem/bin/monitor/components/impl/ThresholdBreachDetector.class
	MonitoringSystem/bin/utils/Constants.class
water usage trends
Merge branch 'master' of https://github.com/smartwatermanagement/self-healing-water-networks

Conflicts:
	MonitoringSystem/bin/monitor/components/impl/IssueTracker.class