Tweakin
Merge remote-tracking branch 'origin/master'
Preliminary work for grouping on the Location View