cc
Signed-off-by: andyaqu126 <andyaqu@126.com>
kkkk

Signed-off-by: andyaqu126 <andyaqu@126.com>
Merge branch 'master' of github.com:andyaqu/phb

Conflicts:
	src/main/webapp/WEB-INF/layouts/front-footer.jsp
	src/main/webapp/WEB-INF/layouts/search-footer.jsp