fix on composer.json
Merge branch 'master' of git://github.com/akeneo/ConnectorMappingBundle

* 'master' of git://github.com/akeneo/ConnectorMappingBundle:
  Fix merge on mapping
  Update composer.json
  Removed Abstract mention in Mapper\Mapper #1
  Fix bug in add method of MappingCollection #1