PIM-3129: Remove mimetype check during file import.
PIM-3129: Prevent to import files that contains non UTF8 characters
PIM-3129: Fix random CS
Merge pull request #1543 from akeneo/PIM-3129

PIM-3129: Prevent to import files that contains non UTF8 characters
Merge branch 'master' into fix/pim-3129
Merge pull request #1550 from akeneo/fix/pim-3129

PIM-3129: Prevent to import files that contains non UTF8 characters
Prepare 1.2.5 tag
PIM-3129: fix CS
Merge branch 'master' into merge/fixes-1.2

Conflicts:
	CHANGELOG.md
	src/Pim/Bundle/CatalogBundle/Version.php
Update changelog
Merge pull request #1558 from akeneo/merge/fixes-1.2

Merge/fixes 1.2
Merge branch 'master' into PIM-3131

* master:
  Update changelog
  PIM-3129: fix CS
  Prepare 1.2.5 tag
  PIM-3129: Fix random CS
  PIM-3129: Prevent to import files that contains non UTF8 characters
  PIM-3129: Remove mimetype check during file import.

Conflicts:
	CHANGELOG.md