location views: group hours together
Merge branch 'master' into test