薛泰-----2013/11/18 23:45 晚上提交
Merge remote-tracking branch 'origin/xuetai' into TrainLine1.0

Conflicts:
	WebRoot/backend/classes/certificateList.html
	WebRoot/backend/classes/classes.html
	WebRoot/backend/questionnaire/manage-show.html
	WebRoot/backend/study/class-system.html
	WebRoot/backend/study/note-overview.html
	src/cn/com/action/CourseAction.java
	src/cn/com/action/CredentialAction.java
	src/cn/com/action/NoteAction.java
	src/cn/com/action/QuestionnaireAction.java
	src/cn/com/action/TrainingClassAction.java
	src/cn/com/config/struts/struts-TrainingClassAction.xml
	src/cn/com/config/struts/struts-courseAction.xml
	src/cn/com/config/struts/struts-noteAction.xml
	src/cn/com/config/struts/struts-questionnaireAction.xml
	src/cn/com/service/NoteService.java
	src/struts.xml