TestRG
Merge branch 'workspacerg'

Conflicts:
	ratp/src/Launcher/launcher.java
conflict
conflict2