Merge branch 'iss260' into android-chat-only
profile add class