Method visibility and order fixes
Remove redundant phpunit config file from FlexibleEntityBundle
Clean up FlexibleEntityBundle readme
Merge branch 'master' into oro/grid

Conflicts:
	src/Pim/Bundle/CatalogBundle/DependencyInjection/PimCatalogExtension.php
	src/Pim/Bundle/FlexibleEntityBundle/AttributeType/AbstractAttributeType.php