fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/port/
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/command/AddModuleAudioScopeCommandTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/command/AddModuleNOISECommandTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/command/AddModuleRECCommandTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/command/ToolbarCurrentWireColorCommandTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/command/ToolbarPausePlayCommandTest.java
Merge branch 'master' of https://github.com/m2gl-synthlab/synthlab

Conflicts:
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/ISynthApp.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/ISynthFrame.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/SynthApp.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/SynthFrame.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/filter/AmplitudeModulatorFilter.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/filter/AttenuationFilter.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/AModule.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/IModule.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/audioscope/IModuleAudioScope.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/eg/IModuleEG.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/eg/ModuleEG.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/keyboard/ModuleKeyboard.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/noise/ModuleNOISE.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/out/ModuleOUT.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/rec/IModuleREC.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/rec/ModuleREC.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/rep/ModuleREP.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/vca/IModuleVCA.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/vca/ModuleVCA.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/vcf/ModuleVCF_HP.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/vcf/ModuleVCF_LP.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/module/vco/ModuleVCO.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/synthesizer/Synthesizer.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/wire/IWire.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/abstraction/wire/Wire.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/command/menu/AddModuleAudioScopeCommand.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/command/menu/AddModuleEGCommand.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/command/menu/AddModuleNOISECommand.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/command/menu/AddModuleOUTCommand.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/command/menu/AddModuleRECCommand.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/command/menu/AddModuleREPCommand.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/command/menu/AddModuleVCACommand.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/command/menu/AddModuleVCFHPCommand.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/command/menu/AddModuleVCFLPCommand.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/command/menu/AddModuleVCOCommand.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/command/menu/SaveAsSynthCommand.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/command/menu/SaveSynthCommand.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/command/toolbar/ToolbarCurrentWireColorCommand.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/module/audioscope/CModuleAudioScope.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/module/eg/CModuleEG.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/module/keyboard/CModuleKeyboard.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/module/keyboard/ICModuleKeyboard.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/module/mix/CModuleMIX.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/module/noise/CModuleNOISE.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/module/out/CModuleOUT.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/module/rec/ICModuleREC.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/module/rep/CModuleREP.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/module/vca/CModuleVCA.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/module/vcf/CModuleVCF_HP.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/module/vcf/CModuleVCF_LP.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/module/vco/CModuleVCO.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/port/CInputPort.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/synthesizer/CSynthesizer.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/synthesizer/ICSynthesizer.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/wire/CWire.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/factory/IFactory.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/factory/IPFactory.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/factory/impl/AFactory.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/factory/impl/CFactory.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/factory/impl/PFactory.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/presentation/module/audioscope/IPModuleAudioScope.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/presentation/module/audioscope/PModuleAudioScope.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/presentation/module/keyboard/IPModuleKeyboard.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/presentation/module/keyboard/PModuleKeyboard.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/presentation/module/mix/PModuleMIX.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/presentation/module/noise/PModuleNOISE.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/presentation/module/vca/PModuleVCA.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/presentation/module/vcf/PModuleVCF.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/presentation/module/vco/PModuleVCO.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/presentation/port/PInputPort.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/presentation/port/POutputPort.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/presentation/synthesizer/PSynthesizer.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/presentation/util/RotaryTextController.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/presentation/wire/PWire.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/util/WriteXMLFile.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/AllTests.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/AllTests.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/SynthesizerTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/WireTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/filter/AmplitudeModulatorFilterTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/filter/AttenuationFilterTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/filter/FrequencyModulatorFilterTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/filter/QuadrupleMixFilterTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/filter/TriplePassThroughFilterTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/module/ModuleAudioScopeTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/module/ModuleEGTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/module/ModuleMIXTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/module/ModuleOUTTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/module/ModuleREPTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/module/ModuleTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/module/ModuleVCATest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/module/ModuleVCF_HPTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/module/ModuleVCF_LPTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/abstraction/module/ModuleVCOTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/command/AllCommandTests.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/command/NewSynthCommandTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/controler/module/AllControlerModuleTests.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/controler/module/CModuleAudioScopeTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/controler/module/CModuleRECTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/controler/port/CInputPortTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/controler/port/COutputPortTest.java
	fr.istic.synthlab/src/test/java/fr/istic/synthlab/factory/AFactoryTest.java