order troops in progress
Merge branch 'master' of https://github.com/Sloth6/Colludo
Got army building correctly, both cases if an army is already on the city or not.
Some cosmetic changes to world, including army size, tile heights and army.city models.
Merge branch 'master' of https://github.com/Sloth6/Colludo