New method refreshUserInfo to merge old and new userInfo and keep app messages
Add missing IDE conf file
Merge branch 'master' of github.com:E-Wok/Cryptalker-android
Merge branch 'master' of github.com:E-Wok/Cryptalker-android
Pending message + encryption