Discipline combat bonus now affects all units

-PROMOTION_ADJACENT_BONUS has been assigned to the remaining unitcombat
types
- spread sheet updated