merge Before
Commit 2013/11/21
完成后台图书管理CRUD操作
Merge remote-tracking branch 'origin/TrainLine1.0' into xuetai1

Conflicts:
	src/cn/com/config/spring/applicationContext-dao.xml
	src/cn/com/dao/CourseDAO.java
	src/cn/com/dao/NoteDAO.java
	src/cn/com/dao/QuestionnaireDAO.java
	src/cn/com/dao/ResourseandcatelogueDAO.java
	src/cn/com/dao/TrainingclassDAO.java