Merge branch 'test' of github.com:/ITS-UofIowa/dining.uiowa.edu into test
location views: group hours together
Merge branch 'master' into test
Merge branch 'test' into prod