addValve
Merge branch 'liu'

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