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/cache/prod/appProdDebugProjectContainer.php
	app/cache/prod/appProdDebugProjectContainer.xml
	app/logs/prod.log