input for part2
Merge branch 'part1' into part2
Merge branch 'part2' into part3

Conflicts:
	src/com/anderscore/simpleandroidchat/ChatActivity.java
	src/com/anderscore/simpleandroidchat/ContactListActivity.java
	src/com/anderscore/simpleandroidchat/ContactListAdapter.java
Merge branch 'part3' into part4

Conflicts:
	src/com/anderscore/simpleandroidchat/ContactListActivity.java
Merge branch 'part4' into part5