taglib problem
Merge branch 'liu' of https://github.com/lsr90518/ValdacBeta into jzh

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