Resolved conflicts
Merge branch 'master' of https://github.com/roisnetf/EMN-AndroidChat.git
Set up the chat activity components
Misc
Merge branch 'master' of https://github.com/roisnetf/EMN-AndroidChat.git