fixed
Merge branch 'master' of https://github.com/justjv/yiz

Conflicts:
	WebContent/WEB-INF/jsp/tiezi/tieziList.jsp