Added receiving, sending, displaying, and logging of chat messages
merge conflict
Merge pull request #116 from ollieh/master

Added receiving, sending, displaying, and logging of chat messages
Populate tox friends list on start
Add/Remove friends from tox friend list as well
Modified the UI of Settings Activity. It also shows any previously saved settings