add kiki system
add kiki system
Merge commit '176fec79329e83033433ab1d04a7b36771a6e3dc' into zhang

Conflicts:
	.idea/workspace.xml
	target/ValdacBeta.war