chapter 12 to p.144
Merge branch 'master' of https://github.com/ffrey/sf2-tuto

Conflicts:
	TODO.txt
	path/src/Acme/TaskBundle/Controller/DefaultController.php