Added Chat Activity again
Changed launcher icon
Merge branch 'part1' into part2
fix in ChatActivity
Merge branch 'part2' of https://github.com/mjohenneken/SimpleAndroidChat into part2
Merge branch 'part1' into part2