Fixed Combat calculation bug, turn display more consistent.
Merge branch 'master' of https://github.com/chudooder/FEMultiplayer.git