x
fix bug
refactor
Merge branch '0.49' of git://github.com/qii/weiciyuan into 0.49

Conflicts:
	src/org/qii/weiciyuan/ui/userinfo/UserInfoActivity.java