Option to delete chat while deleting a friend
Merge remote-tracking branch 'upstream/master'
option to delete chat while deleting a friend
fixing conflicts

delete chat while deleting a friend
Merge remote-tracking branch 'upstream/master'
git reset HEAD app/src/main/java/im/tox/antox/ChatFragment.java
git reset HEAD app/src/main/java/im/tox/antox/FriendsListAdapter.java
bug fix in updateChat

bug fix in updateChat
Merge remote-tracking branch 'upstream/master'
Merge pull request #151 from strider29/master

optional delete chat and bug fix in updateChat