Delete particular chat messages
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/src/main/java/im/tox/antox/ChatMessagesAdapter.java
correction
Merge pull request #188 from strider29/master

delete a particular chat message