gson
kiki complete
buhin
table change
Merge branch 'master' of https://github.com/lsr90518/ValdacBeta into jzh

Conflicts:
	target/ValdacBeta.war
	target/ValdacBeta/WEB-INF/classes/com/ValdacBeta/dao/UserMapper.xml