cleanup
Merge branch 'dev' of github.com:inkrement/messenger into dev