Fixes wrong total count when merging

-- estabeditor.model package is subdivided into model.hash (for element comparison without ids) and model.id (for element comparison by id).
Merge pull request #1 from heinetron/develop

Fixes wrong total count when merging