fixed flashing color on tabs
Merge branch 'map' into develop