Annotator - simplify parameter parsing
merge - resolve conflicts in annotator controller
Annotator - revise parameters and tests