Refactoring SensorDataDao
Merge branch 'master' of http://github.com/smartwatermanagement/self-healing-water-networks