Tweaked the Location storage
Merge origin/master
Refactored test data generation to new HourlyData structure