Merge branch 'dev'

* dev:
  map mechanism, badges
Merge branch 'dev'

* dev:
  fixed number bugs, removed voice-picture completely
Merge branch 'dev'

* dev:
  bug fix and api text
Merge branch 'dev'

* dev:
  urgent fix
Merge branch 'dev'

* dev:
  bug fixes
enable invalidate
Merge branch 'master' into dev

* master:
  enable invalidate
admin interface