update
Merge branch 'offline' of https://github.com/vVYou/CoreBundle into offline

Conflicts:
	Resources/config/twig.yml