+ Persistance des donnees
Merge branch 'master' of https://github.com/jmarginier/simulator.git

Conflicts:
	simulator/src/main/java/model/component/Component.java
	simulator/src/main/java/model/dao/factory/DAOFactory.java
	simulator/src/main/java/model/dao/factory/XmlDAOFactory.java
	simulator/src/main/java/model/mediator/Mediator.java
	simulator/src/main/java/model/strategies/NullStrategy.java