Initial commit
Merge https://github.com/gingray/EntityMerger