Add sortByGroup to Block and sortTrailsByGroup
Force sort on update to collection, delete from collection and update of
collection meta
Sort using groupBy
Merge branch 'fix-group-order'