3tab
Merge remote-tracking branch 'origin/android-chat-only' into iss299
pre-presentation commit