Added Chat Activity again
Changed launcher icon
Merge branch 'part1' into part2
Merge branch 'part2'

Conflicts:
	src/com/anderscore/simpleandroidchat/ChatActivity.java