chargement début
Merge branch 'master' of https://github.com/zives/ISTIC-M2GL-Grp1-Projet

Conflicts:
	synthlabGUI/src/main/java/group1/project/synthlab/ihm/workspace/CWorkspace.java
Merge branch 'master' of https://github.com/zives/ISTIC-M2GL-Grp1-Projet
sauvegarde module
Merge branch 'master' of https://github.com/zives/ISTIC-M2GL-Grp1-Projet

Conflicts:
	synthlabGUI/src/main/java/group1/project/synthlab/ihm/module/out/POutModule.java
	synthlabGUI/src/main/java/group1/project/synthlab/ihm/module/sequencer/CSequencerModule.java
	synthlabGUI/src/main/java/group1/project/synthlab/ihm/module/sequencer/PSequencerModule.java
	synthlabGUI/src/main/java/group1/project/synthlab/ihm/tools/CTools.java
	synthlabGUI/src/main/java/group1/project/synthlab/ihm/workspace/CWorkspace.java