changed desert/arctic combat promotions to upgrade discount I and II
added upgrade discount II as free promotion to seafaring trait
removed comando free promotion from aggresive trait