conclusion
Merge branch 'master' of github.com:vegaen/SecureIM