Entity hash grouping and existing add
Merge branch 'master' of https://github.com/JAForbes/e