update
Merge branch 'master' of github.com:momoplan/Game2

Conflicts:
	res/layout/my_role_item.xml
	src/com/chatgame/adapter/MyTitleListAdapter.java