merger  before
Merge remote-tracking branch 'origin/xuetai1' into xuetai1

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