1.9.28.31
Merge branch 'master' of https://github.com/MapleWhisper/ZhaoPin.git

Conflicts:
	WebRoot/WEB-INF/jsp/client/personalCenter.jsp
	src/com/zhaopin/client/controller/ApplyController.java
	src/com/zhaopin/client/controller/PersonalCenterController.java
	src/com/zhaopin/client/server/UserServer.java
	src/com/zhaopin/client/server/UserServerImpl.java
	src/com/zhaopin/po/Resume.java
	src/com/zhaopin/test/Test.java