work from home
Merge branch 'master' of https://github.com/kyofu/ChatProgram

Conflicts:
	AndroidManifest.xml
	res/layout/activity_chatroom_detail.xml
	res/layout/fragment_chatroom_detail.xml
	src/com/example/chatprogram/ClientThread.java
	src/com/example/chatprogram/activity/ChatRoomDetailActivity.java
	src/com/example/chatprogram/activity/ChatRoomListActivity.java
	src/com/example/chatprogram/activity/LoginActivity.java