modified annotator to consider source/target if present in metaphorAnnotationRecords.annotationMappings and
metaphorAnnotationRecords itself.
Merge branch 'dev' of https://github.com/isi-metaphor/lcc-service into dev
added back the storing of task_id in the json if requested (so the json response tells you the log entry)
added handling of 2 types of output graphs: dograph=="ALL" draws all edges (also not belonging to the solution)
dograph=="SOLUTION" (or simply True draws only the solution).
dograph=="NOGRAPH" or False draws nothing.
Merge branch 'master' into dev