legeres modif jsp trainingPlaceCamera
Correctif web services
Merge origin/master

Conflicts:
	src/main/webapp/resources/css/style.css