Merge branch 'master' into audio_message
Merge branch 'audio_message' of https://github.com/kontalk/androidclient into audio_message
Merge branch 'audio_message' into ptt_message