Merge branch 'master' of C:\Data\MyDev\IntelliJWorkspace\IoServer with conflicts.
implemented MeasurementDao
implemented MeasurementDao