Updated UI in AddContactActivity and fixed key creation
Updated UI in ConversationActivity
Merge branch 'master' of github.com:Afterglow375/CryptoChat