merge before
Merge branch 'xuetai1' of https://github.com/mcf171/TrainLine.git into
xuetai1

Conflicts:
	src/cn/com/action/CourseAction.java