Hourly Average Implemented

Needs storyboard updates - to do on develop
Merge branch 'dev/HistoryTabDataV3' into develop
Merge branch 'develop' of https://github.com/amyschmidt/Tracker into develop