Merge branch 'master' of github.com:11693-5/project-team5
Merge branch 'xiaohan'
Ningna Wang
merge
resolve conflict
replace with my id
modify example
+ documents
resolve conflict
Merge remote-tracking branch 'origin/annotator' into xiaohan
Merge branch 'cyc' into annotator

Conflicts:
	project-team05/src/main/java/util/GoPubMedServiceExample.java
+cas consumer
make slide adjustment
merge
+collectionreader +cpeDescriptor
Merge remote-tracking branch 'origin/freddiez' into xiaohan
modify consumer
Merge branch 'xiaohan'
refactor
merge
merge