Adding dependencies
Merge branch 'master' into dev-admin
iUpdate dependencies
FIX Azure initialization
FIX ACS integration
Init AdmingeneratorGeneator
Create two entities
Init AdmingeneratorGeneator
Create two entities
Merge branch 'dev-admin' of github.com:brainsonic/SymfonyAzureBench into dev-admin

Conflicts:
	app/AppKernel.php
Initialize admin generated files
Config admin
Config admin
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

Conflicts:
	src/Acme/DemoBundle/Resources/config/Category-generator.yml
Merge branch 'dev-admin' of https://github.com/brainsonic/SymfonyAzureBench into dev-admin
Merge branch 'dev-admin' of https://github.com/brainsonic/SymfonyAzureBench into dev-admin
Merge branch 'dev-admin' of https://github.com/brainsonic/SymfonyAzureBench into dev-admin
Adding SQLSrv drivers
Config from env
Force doctrine update (for demo purpose only)
Update JMS DI Extra Bundle to use fix for Windows