Added date label based on preference for grid
Merge branch 'master' of https://github.com/EdgeComputing/cats