Finished refactoring TemperatureDataPoint to a generic DataPoint.
Merge branch 'master' into data-import-development
Merge branch 'data-import-development'