khadim machin
fos
fos Merge branch 'master' of https://github.com/alakhame/remi

Conflicts:
	Symfony/src/Innovit/GeneralBundle/Controller/GeneralController.php
	Symfony/src/Innovit/GeneralBundle/Resources/config/routing.yml
	Symfony/src/Innovit/GeneralBundle/Resources/views/General/Layoutgeneral.php.twig
route conflict
commit pliz