reader
annotator
annotator added
modified annotator
resolve conflict
Merge remote-tracking branch 'origin/annotator' into xiaohan
bug fixed
Merge branch 'cyc' into annotator

Conflicts:
	project-team05/src/main/java/util/GoPubMedServiceExample.java
Merge branch 'annotator' into cyc

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'