Changed fixtures and translations
Fix family celaner for undeletable attribute sets
Improve translations
Fix attribute export when attribute is not in mapping
Fix for PR #152
Fix duplicated code for PR #152

*fix dupicated code and added it in a method
Merge branch 'master' into fix/magento-attributeid
Rename function for PR 152
Merge branch 'master' into fix/magento-attributeid

Conflicts:
	Writer/AttributeWriter.php
Fix failing specs on master #158
Merge pull request #159 from akeneo/fix/testmaster

Fix failing specs on master #158
Merge branch 'master' into fix/magento-attributeid
Merge pull request #152 from akeneo/fix/magento-attributeid

Fix/magento attributeid
Merge branch 'master' into feature/attribute_mapping_refactor

Conflicts:
	Writer/AttributeWriter.php
	spec/Pim/Bundle/MagentoConnectorBundle/Mapper/MagentoAttributeMapperSpec.php
	spec/Pim/Bundle/MagentoConnectorBundle/Mapper/ORMAttributeMapperSpec.php
Fix failing test #156
Fix PSR2 errors #156