git ignore
Configuration changes
Merge branch 'master' of https://github.com/smartwatermanagement/self-healing-water-networks

Conflicts:
	MonitoringSystem/bin/.gitignore
	MonitoringSystem/bin/utils/Constants.class
Removed SensorDataDAO from Monitoring system and made it a seperate module