Merge branch 'test' of github.com:/ITS-UofIowa/dining.uiowa.edu into test
Merge branch 'refs/heads/master' into test
Merge branch 'refs/heads/master' into test
Merge branch 'refs/heads/master' into test
Merge branch 'refs/heads/master' into test
Merge branch 'refs/heads/master' into test
Merge branch 'master' into test
Merge branch 'refs/heads/master' into test
Merge branch 'master' into test
Merge branch 'test' of github.com:/ITS-UofIowa/dining.uiowa.edu into test
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'master' into test
Merge branch 'master' into test
location views: use plus sign separator for hours
Merge branch 'master' of github.com:/ITS-UofIowa/dining.uiowa.edu