fos
khadim ....
acces control //
 bug merger .... Merge branch 'master' of https://github.com/alakhame/remi

Conflicts:
	Symfony/app/cache/dev/annotations/377aeed842712babfddf54e32bcc7bcc91f4a839#registerAction.cache.php
	Symfony/app/cache/dev/annotations/377aeed842712babfddf54e32bcc7bcc91f4a839.cache.php
	Symfony/app/cache/dev/annotations/38f7b61d7629ad7f78afeb64e98ac94ddef54c8d#isAccountNonExpired.cache.php
	Symfony/app/cache/dev/annotations/38f7b61d7629ad7f78afeb64e98ac94ddef54c8d#isAccountNonLocked.cache.php
	Symfony/app/cache/dev/annotations/38f7b61d7629ad7f78afeb64e98ac94ddef54c8d#isCredentialsNonExpired.cache.php
	Symfony/app/cache/dev/annotations/38f7b61d7629ad7f78afeb64e98ac94ddef54c8d#isEnabled.cache.php
	Symfony/app/cache/dev/annotations/38f7b61d7629ad7f78afeb64e98ac94ddef54c8d.cache.php
	Symfony/app/cache/dev/annotations/3ef101fda17afe64c2a0060ad07b3db379ec000c#pickAction.cache.php
	Symfony/app/cache/dev/annotations/3ef101fda17afe64c2a0060ad07b3db379ec000c.cache.php
	Symfony/app/cache/dev/annotations/5bce5fda73aabf87399c0837291822c61d42d6a2#coursByIdAction.cache.php
	Symfony/app/cache/dev/annotations/5bce5fda73aabf87399c0837291822c61d42d6a2#matCoursAction.cache.php
	Symfony/app/cache/dev/annotations/5bce5fda73aabf87399c0837291822c61d42d6a2#matieresRevAction.cache.php
	Symfony/app/cache/dev/annotations/6d77c4060d2c46d7db2a54ee9d739c0f7b88bfde#addGroup.cache.php
	Symfony/app/cache/dev/annotations/6d77c4060d2c46d7db2a54ee9d739c0f7b88bfde#getGroupNames.cache.php
	Symfony/app/cache/dev/annotations/6d77c4060d2c46d7db2a54ee9d739c0f7b88bfde#getGroups.cache.php
	Symfony/app/cache/dev/annotations/6d77c4060d2c46d7db2a54ee9d739c0f7b88bfde#hasGroup.cache.php
	Symfony/app/cache/dev/annotations/6d77c4060d2c46d7db2a54ee9d739c0f7b88bfde#removeGroup.cache.php
	Symfony/app/cache/dev/annotations/6d77c4060d2c46d7db2a54ee9d739c0f7b88bfde.cache.php
	Symfony/app/cache/dev/twig/13/9d/dc5a3f46b6a725b60c5094bbcfb69c7358d55b81e39d7ed598032722e15b.php
	Symfony/app/cache/dev/twig/85/39/1592957fcbe745356b60f788e4ee29a990be7b27247494fc5aeae1afba95.php
	Symfony/app/cache/dev/twig/8f/54/ae10298bc39c5ffae696ca2d214c9265a533ebde6899d0304825dfe40d36.php
	Symfony/app/cache/dev/twig/91/61/aebc17c0ab89d8ddb1e4d10af14d4bb3b3be1409a3f09bbf63d67e744fe6.php
	Symfony/app/cache/dev/twig/ec/59/f9ae02314cf076e93e35a4244160a8e5229a8812f35f244cd1c356884c5b.php
	Symfony/app/logs/dev.log
	Symfony/src/Innovit/GeneralBundle/Resources/views/General/general.html.twig
	Symfony/src/Innovit/ProfilBundle/Controller/ProfilController.php
	Symfony/src/Innovit/ProfilBundle/Resources/config/routing.yml
	Symfony/src/Innovit/UserBundle/Entity/User.php
bug fix