...
Merge branch 'master' of https://github.com/malaizaa/doubleSF2

Conflicts:
	app/AppKernel.php