test
Merge branch 'master' of https://github.com/yang2012/DocumentManageSystem
Merge branch 'master' of https://github.com/yang2012/DocumentManageSystem

Conflicts:
	src/main/webapp/pages/docinfo.vtl