Merge branch 'master' of https://github.com/conchrist/dogma
Login + chat