- preparation for grouping fixes
Merge branch 'BetterExplorer2.5' of https://github.com/DimitarCC/BetterExplorer into BetterExplorer2.5