Fixing some bugs
Merge branch 'aurelie'
Fixing some bugs (territory map location)