merge Before
Merge remote-tracking branch 'origin/TrainLine1.0' into yanzi

Conflicts:
	src/cn/com/config/struts/struts-liberary.xml
yanzipage