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

Conflicts:
	simulator-ep/src/main/java/ep/strategies/TPEStrategy.java
	simulator-ep/src/main/java/ep/strategies/card/CardStrategy.java
	simulator-ep/src/main/java/ep/strategies/card/ChipStrategy.java