Fake commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Sdz/BlogBundle/Controller/BlogController.php