Signed-off-by: yeerin <837017745@qq.com>
Merge branch 'master' of
ssh://git@github.com/xmuzhangshuai/ExamHelperServer.git

Conflicts:
	ExamHelper/WebRoot/WEB-INF/classes/com/yrw/service/CollectionService.class
	ExamHelper/src/com/jsonobjects/JCollection.java
	ExamHelper/src/com/jsonobjects/JNote.java
Merge branch 'master' of ssh://git@github.com/xmuzhangshuai/ExamHelperServer.git