Changes in Commander/Minion combat model (based on Berserk)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/agents/CommanderMinionBehaviour.java
Bug fix