modifs
Merge branch 'master' of https://github.com/GroupePdP/GAT

Conflicts:
	GAT/.gitignore
	GAT/bin/ihm/user/DialogInitNewScenario.class
	GAT/bin/ihm/user/PanelNewScenario.class
Merge remote-tracking branch 'refs/remotes/origin/master'