王珏-2013/11/29
王珏Merge remote-tracking branch 'origin/xuetai1' into xuetai1

Conflicts:
	src/struts.xml