some cleanup
Merge branch 'development' of github.com:siacs/Conversations into development