v2 changes
res conf
res
res
Merge branch 'master' of https://github.com/boussad-m2gl/GTR.git

Conflicts:
	projTestTrain1/src/pack1/C1.java