Merge branch 'master' into feature8162

Conflicts:
	app-import/src/main/java/eu/etaxonomy/cdm/io/plantglossary/PlantGlossaryCsvImportState.java

diff --cc app-import/src/main/java/eu/etaxonomy/cdm/io/plantglossary/PlantGlossaryCsvImportState.java
index 682350b9e31b290e1a726e2a889b07a2e1a31619,3ebbacbc960446f84f041bdf90649f5b8d573fee..6adb144a70435bd3c13eadee09432bb97d799747
--- 1/app-import/src/main/java/eu/etaxonomy/cdm/io/plantglossary/PlantGlossaryCsvImportState.java
--- 2/app-import/src/main/java/eu/etaxonomy/cdm/io/plantglossary/PlantGlossaryCsvImportState.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/plantglossary/PlantGlossaryCsvImportState.java
@@@ -21,7 -21,12 +21,15 @@@ import eu.etaxonomy.cdm.io.csv.in.CsvIm
  import eu.etaxonomy.cdm.model.agent.Institution;
  import eu.etaxonomy.cdm.model.agent.Person;
  import eu.etaxonomy.cdm.model.agent.Team;
++<<<<<<< HEAD
++=======
+ import eu.etaxonomy.cdm.model.common.IdentifiableSource;
+ import eu.etaxonomy.cdm.model.common.OriginalSourceType;
+ import eu.etaxonomy.cdm.model.common.TermType;
+ import eu.etaxonomy.cdm.model.common.TermVocabulary;
++>>>>>>> master
  import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
+ import eu.etaxonomy.cdm.model.description.Feature;
  import eu.etaxonomy.cdm.model.description.State;
  import eu.etaxonomy.cdm.model.reference.Reference;
  import eu.etaxonomy.cdm.model.reference.ReferenceFactory;