Merge branch 'master' of https://github.com/Gerome54520/ProjetWebSujet2

Conflicts:
	app/cache/dev/annotations/Sujet2-DevSpeBundle-Entity-Parametre$contraintes.cache.php
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/logs/dev.log
	src/Sujet2/DevSpeBundle/Entity/Contrainte.php
	src/Sujet2/DevSpeBundle/Entity/TypePts.php
Merge branch 'master' of https://github.com/Gerome54520/ProjetWebSujet2

Conflicts:
	app/Resources/views/layout.html.twig
	app/cache/dev/annotations/Acme-SecurityBundle-Entity-User$id.cache.php
	app/cache/dev/annotations/Acme-SecurityBundle-Entity-User$roles.cache.php
	app/cache/dev/annotations/Acme-SecurityBundle-Entity-User.cache.php
	app/cache/dev/annotations/Acme-SecurityBundle-Entity-UserRepository.cache.php
	app/cache/dev/annotations/Sujet2-DevSpeBundle-Entity-Parametre$contraintes.cache.php
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevDebugProjectContainerCompiler.log
	app/cache/dev/assetic/routing.yml
	app/cache/prod/annotations/Acme-SecurityBundle-Controller-SecurityController#choixAction.cache.php~HEAD
	app/cache/prod/annotations/Acme-SecurityBundle-Controller-SecurityController#choixAction.cache.php~de579f47cca4e8553f8852583bd7b16b0c1676ac
	app/cache/prod/annotations/Acme-SecurityBundle-Entity-User$id.cache.php
	app/cache/prod/annotations/Acme-SecurityBundle-Entity-User.cache.php
	app/cache/prod/annotations/Sujet2-DevSpeBundle-Controller-DevSpeController#accueilAction.cache.php
	app/cache/prod/appProdDebugProjectContainer.php
	app/cache/prod/appProdDebugProjectContainer.xml
	app/cache/prod/sessions/sess_d3a51q32vhqg00sdoe5t9p9rn0
	app/cache/prod/sessions/sess_dv5nlimpdr94hmtqephpja8er1
	app/cache/prod/twig/0a/1c/d802f8bea75b62ef48cab6676e5a.php
	app/cache/prod/twig/0c/4b/75376d207a01fe8bfa1c374551e7.php
	app/cache/prod/twig/29/b0/4d160bfd2018f5373f216f1f6bb0.php
	app/logs/dev.log
	app/logs/prod.log
	src/Sujet2/DevSpeBundle/Resources/views/Sujet2View/acceuilenseignant.html.twig
	src/Sujet2/DevSpeBundle/Resources/views/Sujet2View/acceuilgestionnaire.html.twig
	web/css/main.css