First commit
Merge https://github.com/rumee/messaging