Merge branches '2.1-Acme', '2.1-DoctrineFixturesBundle' and '2.1-StofDoctrineExtensionsBundle' into 2.1-startup

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