fixing international cities
fixing colors on 2011, 2012 tabs
Merge branch 'map' into develop