Added auto-increment conflict resolver
Added throw exception conflict resolver
Added DI confif for shit
Integrated conflict resolvers
Merge pull request #88 from symfony-cmf/conflict_resolvers

Conflict resolvers