Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Fixing some missing refactoring
Fix crashing from refactoring.
Set the title of a conversation before the connection of the parteners.
fix: antox logo changes color when user enters search
Merge remote-tracking branch 'upstream/master'
Fixed a bug.
Merge pull request #198 from Corly/work

Set the title of a conversation before the connection of the parteners
Merge pull request #199 from strider29/master

fixed issue #196
Fixed tablet layout
Fix OpenGL bug on Android 4.1.x
Merge remote-tracking branch 'antox/master'
Removing joke toast before I forget
Added android wear support
Merge branch 'master' of https://github.com/Astonex/Antox