minor fix to xml and ChatActivity
Merge branch 'part1' into part2
Merge branch 'part2' into part3