Fix BlogController2
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Sdz/BlogBundle/Controller/BlogController.php
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 4ad93fdefa524b321e157902ce11ab67477a855c.
Revert "Fix BlogController2"

This reverts commit e80f81b0c71c8a4b19be360a9f516f1279522c69.