更新---
update
update 退出登录
Merge branch 'mathua' of https://github.com/MatHua/muzhiliwu into mathua

Conflicts:
	src/com/muzhiliwu/web/gift/AdminModule.java