country bug fix
finish circles map
fix conficts
Merge branch 'dev'