ok
Merge branch 'master' of https://github.com/lezhumain/PPEGSB
Merge branch 'master' of https://github.com/lezhumain/PPEGSB.git
Merge branch 'master' of https://github.com/lezhumain/PPEGSB.git

Conflicts:
	src/PPE/GSBBundle/Controller/DefaultController.php
	src/PPE/GSBBundle/Resources/views/Default/liste_rp.html.twig
Merge branch 'master' of https://github.com/lezhumain/PPEGSB.git

Conflicts:
	src/PPE/GSBBundle/Controller/DefaultController.php
	src/PPE/GSBBundle/Resources/views/Default/liste_rp.html.twig