freddie
reader
annotator
annotator added
modified annotator
resolve conflict
Merge remote-tracking branch 'origin/annotator' into xiaohan
+cas consumer
make slide adjustment