Scratch
Merge branch 'master' of https://github.com/jmarginier/simulator.git

Conflicts:
	gui-simulator/src/main/java/com/mxgraph/examples/swing/editor/EditorActions.java
	gui-simulator/src/main/resources/gui/resources/simulator-ep.properties
	gui-simulator/src/main/resources/gui/resources/simulator-ep_fr.properties
Fenetre composant
Merge
Merge branch 'master' of https://github.com/jmarginier/simulator

Conflicts:
	gui-simulator/src/main/java/fr/ensicaen/gui_simulator/gui/bridge/ComponentWrapper.java
	gui-simulator/src/main/java/fr/ensicaen/gui_simulator/gui/main/CustomGraph.java
	gui-simulator/src/main/java/fr/ensicaen/gui_simulator/gui/main/CustomGraphComponent.java
	gui-simulator/src/main/java/fr/ensicaen/gui_simulator/gui/panel/SimulatorPanel.java
	gui-simulator/src/main/java/fr/ensicaen/gui_simulator/gui/tools/HelpPanel.java
	gui-simulator/src/main/resources/gui/resources/simulator-ep.properties
	gui-simulator/src/main/resources/gui/resources/simulator-ep_fr.properties
	simulator-ep/src/main/java/fr/ensicaen/simulator_ep/ep/strategies/card/CardChipStrategy.java
	simulator-ep/src/main/java/fr/ensicaen/simulator_ep/ep/strategies/card/CardStrategy.java
	simulator-ep/src/main/java/fr/ensicaen/simulator_ep/ep/strategies/ept/EPTChipsetStrategy.java
	simulator-ep/src/main/java/fr/ensicaen/simulator_ep/ep/strategies/ept/EPTSmartCardReaderStrategy.java
	simulator-ep/src/main/java/fr/ensicaen/simulator_ep/ep/strategies/ept/EPTStrategy.java
	simulator-ep/src/main/java/fr/ensicaen/simulator_ep/ep/strategies/fo/FOStrategy.java
	simulator-ep/src/main/java/fr/ensicaen/simulator_ep/ep/strategies/fo/acquirer/FOAcquirerAuthorizationStrategy.java
	simulator-ep/src/main/java/fr/ensicaen/simulator_ep/ep/strategies/fo/acquirer/FOAcquirerStrategy.java
	simulator-ep/src/main/java/fr/ensicaen/simulator_ep/ep/strategies/fo/issuer/FOIssuerAuthorizationStrategy.java
	simulator-ep/src/main/java/fr/ensicaen/simulator_ep/ep/strategies/fo/issuer/FOIssuerStrategy.java
	simulator-ep/src/main/java/fr/ensicaen/simulator_ep/utils/CommonNames.java
	simulator-ep/src/main/java/fr/ensicaen/simulator_ep/utils/GenerateBaseComponents.java
	simulator-ep/src/test/java/ep/strategies/card/CardTest.java
	simulator-ep/src/test/java/ep/strategies/ept/EPTUnitTest.java
	simulator-ep/src/test/java/ep/strategies/fo/FOUnitTest.java
	simulator/src/main/java/fr/ensicaen/simulator/model/component/ComponentI.java
	simulator/src/main/java/fr/ensicaen/simulator/model/component/ComponentIO.java
	simulator/src/main/java/fr/ensicaen/simulator/model/component/ComponentO.java
	simulator/src/main/java/fr/ensicaen/simulator/model/dao/ScenarioData.java
	simulator/src/main/java/fr/ensicaen/simulator/model/dao/jaxbadapter/EventMapAdapter.java
	simulator/src/main/java/fr/ensicaen/simulator/model/factory/MediatorFactory.java
	simulator/src/main/java/fr/ensicaen/simulator/model/mediator/ForwardMediator.java
	simulator/src/main/java/fr/ensicaen/simulator/model/mediator/HalfDuplexMediator.java
	simulator/src/main/java/fr/ensicaen/simulator/model/mediator/Mediator.java
	simulator/src/main/java/fr/ensicaen/simulator/model/mediator/PipedMediator.java
	simulator/src/main/java/fr/ensicaen/simulator/model/mediator/ReverseHalfDuplexMediator.java
	simulator/src/main/java/fr/ensicaen/simulator/model/mediator/SimplexMediator.java
	simulator/src/main/java/fr/ensicaen/simulator/model/properties/PropertyDefinition.java
	simulator/src/main/java/fr/ensicaen/simulator/simulator/Simulator.java
	simulator/src/test/java/fr/ensicaen/simulator/dao/XmlDaoTest.java
	simulator/src/test/java/fr/ensicaen/simulator/model/mediator/ForwardMediatorTest.java
	simulator/src/test/java/fr/ensicaen/simulator/simulator/SimulatorTest.java
Some corrections.