Merge branch 'comment-form'

Conflicts:
	src/Blogger/BlogBundle/Resources/views/Blog/show.html.twig