The Branch 1.0 By Wj
the second commit by xuetai
Merge remote-tracking branch 'origin/TrainLine1.0' into xuetai

Conflicts:
	src/cn/com/action/AnnouncementAction.java
xuetai 注释修改
empty the project