chatactivity, profile and contacts
pre merge
merge android-chat-only > iss299