Test with romain
Merge branch 'workspacerg'

Conflicts:
	ratp/src/Launcher/launcher.java
conflict
conflict2
MAJ
je pete tout !
Merge branch 'workspacerg'

Sans conflit
Merge from workspacerg
SaveMyLife
SaveMyLife2
Merge branch 'master' into workspacerg

Conflicts:
	ratp/src/Launcher/launcher.java
	ratp/src/algo_ratp/Maps.java
	ratp/src/algo_ratp/Stations.java