delete 1.mp4
xuetai
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
Merge remote-tracking branch 'origin/xuetai' into TrainLine1.0

Conflicts:
	src/applicationContext.xml
	src/cn/com/action/AnnouncementAction.java
	src/cn/com/dao/NoteDAO.java
	src/cn/com/dao/NoticeDAO.java
	src/cn/com/dao/NoticetypeDAO.java
	src/cn/com/dao/PersonalinformationDAO.java
	src/cn/com/dao/PostDAO.java
	src/cn/com/dao/PractisingcertificateDAO.java
	src/cn/com/dao/QuestionarrangementDAO.java
	src/cn/com/dao/QuestionnaireDAO.java
	src/cn/com/dao/QuestionnairerubricDAO.java
	src/cn/com/dao/RecordDAO.java
	src/cn/com/dao/ResourceDAO.java
	src/cn/com/dao/ResourseandcatelogueDAO.java
	src/cn/com/dao/TcommentDAO.java
	src/cn/com/dao/TestarrangementDAO.java
	src/cn/com/dao/TestpaperDAO.java
	src/cn/com/dao/TestquestionDAO.java
	src/cn/com/dao/ThemeDAO.java
	src/cn/com/dao/TopicDAO.java
	src/cn/com/dao/TopicaccessoryDAO.java
	src/cn/com/dao/TrainingclassDAO.java
	src/cn/com/dao/UserandcourseDAO.java
	src/cn/com/dao/UserandmailDAO.java
	src/cn/com/dao/UserandquestionDAO.java