优化插入用户信息到本地库时使用事务提交
Merge branch 'master' of git@github.com:momoplan/Game2.git

Conflicts:
	src/com/chatgame/adapter/FriendListViewAdapter.java