Merge branch 'dev', remote branch 'origin'
Merge branch 'master' of https://github.com/skatkatt/tg