Add war and heavy industry bonuses.
Tweaked officer classes.
Fix government bug.
Tweak army conversion to be less random.
Fix air units.