1 connection
fix some bugs
merge andoid-chat-only > master