Nasreddine FAREH : effectifeleve_residantboursier_cycleenseignement  partie
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Sise/Bundle/CoreBundle/Controller/OrientationFilieresportController.php
	src/Sise/Bundle/CoreBundle/Entity/OrientationEleveredoublantdeuxiemeannee.php
	src/Sise/Bundle/CoreBundle/Entity/OrientationEleveredoublanttroisiemeannee.php
	src/Sise/Bundle/CoreBundle/Entity/OrientationElevereussideuxiemeannee.php
	src/Sise/Bundle/CoreBundle/Entity/OrientationElevereussitroisiemeannee.php
	src/Sise/Bundle/CoreBundle/Entity/OrientationFilieresportversgeneraletroisieme.php
	src/Sise/Bundle/CoreBundle/Resources/views/OrientationEleveredoublantdeuxiemeannee/edit.html.twig
	src/Sise/Bundle/CoreBundle/Resources/views/OrientationEleveredoublanttroisiemeannee/edit.html.twig
	src/Sise/Bundle/CoreBundle/Resources/views/OrientationElevereussideuxiemeannee/edit.html.twig
	src/Sise/Bundle/CoreBundle/Resources/views/OrientationElevereussitroisiemeannee/edit.html.twig
	src/Sise/Bundle/CoreBundle/Resources/views/OrientationFilieresportversgeneraletroisieme/edit.html.twig
Nasreddine FAREH : effectifeleve_residantboursier_cycleenseignement  partie