change var name
Merge branch 'master' of git://github.com/vitiko/IphpContentBundle

Conflicts:
	Resources/views/Content/list.html.twig