Erlendo-map.
Merge branch 'master' of https://github.com/tech-server/tgmanage