Merge branch 'develop' of

https://gitlab.bsc.es/inb/etransafe/pretox-relation-extraction.git into
develop

Conflicts:
	src/main/java/es/bsc/inb/ades/relation/extraction/main/App.java

src/main/java/es/bsc/inb/ades/relation/extraction/main/App.java

@@ -219,11 +219,14 @@ public class App {
 						Annotation is_treatment_related = as.get(new Integer(finding.getFeatures().get("IS_TREATMENT_RELATED").toString()));
 						is_treatment_related.getFeatures().put("ANNOTATION_TYPE", "IS_TREATMENT_RELATED");
 						doc.getAnnotations(annotationSetRelationExtraction).add(is_treatment_related.getStartNode(), is_treatment_related.getEndNode(), "FINDING_"+finding_id, is_treatment_related.getFeatures());
+<<<<<<< HEAD
 					}else {
 						FeatureMap features_t = Factory.newFeatureMap();
 						features_t.put(template_value_name, "Y");
 						features_t.put("ANNOTATION_TYPE", "IS_TREATMENT_RELATED");
 						doc.getAnnotations(annotationSetRelationExtraction).add(finding.getStartNode(), finding.getEndNode(), "FINDING_"+finding_id, features_t);
+=======
+>>>>>>> branch 'develop' of https://gitlab.bsc.es/inb/etransafe/pretox-relation-extraction.git
 					}
 					
 					//verify if is treatment related or not