Merge branch 'dev-admin' of https://github.com/brainsonic/SymfonyAzureBench into dev-admin

Conflicts:
	src/Acme/DemoBundle/Resources/config/Category-generator.yml
Merge branch 'dev-admin' of https://github.com/brainsonic/SymfonyAzureBench into dev-admin