更大更新
Merge branch 'master' of git@github.com:jeasonyoung/examw-test.git

Conflicts:
	src/main/java/com/examw/test/controllers/api/FrontDataController.java
	src/main/java/com/examw/test/service/library/IPaperService.java
	src/main/java/com/examw/test/service/library/impl/PaperServiceImpl.java
	src/main/java/com/examw/test/service/settings/impl/SubjectServiceImpl.java
	src/main/resources/spring-examw-test-service-library.xml