Fixing some bugs
Merge branch 'aurelie'
Fixing some bugs (territory map location)
Merge branch 'thomas'
TerritoryMap according to Players' type OK