Merge remote-tracking branch 'origin/master'

Conflicts:
	Portal/src/main/java/com/zan/portal/model/Category.java
	Portal/src/main/java/com/zan/portal/service/CategoryService.java
	Portal/src/main/webapp/templates/careerBaseTemplate.xhtml
aa
remove removed class
ttt
Merge branch 'master' of https://github.com/xhui/xhui-portal.git