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

Conflicts:
	simulator/src/main/java/model/strategies/CardStrategy.java
	simulator/src/main/java/model/strategies/TPEStrategy.java
Merge branch 'master' of https://github.com/jmarginier/simulator.git