Merge origin/master

Conflicts:
	app/AppKernel.php
	app/Resources/views/base.html.twig
	app/config/routing.yml
	composer.json
	composer.lock
	src/Acme/DemoBundle/AcmeDemoBundle.php