Merge pull request #16 from javers/commit_factory

Commit factory
Merge branch 'master' into entity_collection_diff