Signed-off-by: Bastienp <bastien.poidevain@gmail.com>
Merge branch 'master' of https://github.com/Bastienp/testTDM

Conflicts:
	src/TDM/BlogBundle/Entity/Commentaire.php~