map mechanism, badges
Merge branch 'dev'

* dev:
  map mechanism, badges