travail edit
Merge origin/master
travail edit
Merge
Merge
Merge origin/master

Conflicts:
	src/main/resources/import.sql
	src/main/resources/messages/trainingcameras_en.properties
	src/main/resources/messages/trainingcameras_fr.properties
	src/main/webapp/WEB-INF/jsp/trainingCameras/trainingCameras.jsp
	src/main/webapp/WEB-INF/tiles.xml
Transformation  par camera (edit / new)
CoordonneesGPS par camera (edit / new)
Merge origin/master