Removed category fixture
Merge branch 'rip/fixtures' into task/category_import_fixture

Conflicts:
	src/Pim/Bundle/ImportExportBundle/Transformer/ORMAttributeTransformer.php
Corrected unit tests
Merge branch 'master' into task/category_import_fixture
Fixed CS
Removed unneeded file
Corrected bug with homogeinzation
Merge branch 'master' into task/category_import_fixture

Conflicts:
	src/Pim/Bundle/ImportExportBundle/Reader/File/YamlReader.php
Added unit tests
Added tests
Merge branch 'master' of github.com:akeneo/pim-community-dev
Merge branch 'master' into task/category_import_fixture
Merge branch 'master' of github.com:akeneo/pim-community-dev
Merge branch 'master' into task/category_import_fixture
Updated changelog
Fixed CS
Merge pull request #615 from akeneo/task/category_import_fixture

Task/category import fixture
Merge branch 'master' into PIM-1783