Entity and fixture
Merge remote-tracking branch 'origin/master'

Conflicts:
	symfony/app/AppKernel.php
	symfony/composer.json
	symfony/composer.lock
	symfony/src/Acme/DemoBundle/Controller/BookController.php
	symfony/src/Acme/DemoBundle/Resources/config/routing.yml
	symfony/src/Acme/DemoBundle/Resources/views/Book/index.html.twig
	symfony/src/Acme/DemoBundle/Resources/views/Book/show.html.twig
	symfony/src/Acme/DemoBundle/Tests/Controller/BookControllerTest.php