Merge branch 'jzh' of https://github.com/lsr90518/ValdacBeta

Conflicts:
	target/ValdacBeta/WEB-INF/classes/com/ValdacBeta/controller/KikiController.class
	target/ValdacBeta/WEB-INF/classes/com/ValdacBeta/dao/KikiMapper.class
	target/ValdacBeta/WEB-INF/classes/com/ValdacBeta/service/KikiService.class
	target/ValdacBeta/WEB-INF/pages/addkiki.jsp
	target/ValdacBeta/WEB-INF/pages/css/buhin.css
	target/classes/com/ValdacBeta/controller/KikiController.class
	target/classes/com/ValdacBeta/dao/KikiMapper.class
	target/classes/com/ValdacBeta/service/KikiService.class
valve database was changed & xml bug was modified