location views: update xml feed to separate hours with <br>
Merge branch 'master' into test
Merge branch 'test' into prod