Merged TroopLabel with Country
Merge branch 'master' of https://github.com/bayofpigs/ilnibor-risk.git