fix
Merge branch 'master' of git://github.com/c2is/BigfootContentBundle

Conflicts:
	Twig/Extension/ContentExtension.php