StofDoctrineExtensions: composer.json
StofDoctrineExtensions: AppKernel.php
StofDoctrineExtensions: app/config/config.ini
StofDoctrineExtensions: composer.lock (after composer update stof/doctrine-extensions-bundle)
Merge branch '2.1-StofDoctrineExtensionsBundle' into 2.1-test

Conflicts:
	app/AppKernel.php
	composer.json
	composer.lock
Updated composer.lock