fixed composer.json
migration to SonataClassificationBundle
removed category.orm.xml
Merge branch 'origin/2.3.1'

Conflicts:
	DependencyInjection/Configuration.php
	composer.json