Corrected bug with homogeinzation
Merge branch 'master' into task/category_import_fixture

Conflicts:
	src/Pim/Bundle/ImportExportBundle/Reader/File/YamlReader.php