Merge branch 'develop' into wset

author Patrick Plitzner <p.plitzner@bgbm.org>

Wed, 3 Jan 2018 08:59:54 +0000 (09:59 +0100)

committer Patrick Plitzner <p.plitzner@bgbm.org>

Wed, 3 Jan 2018 08:59:54 +0000 (09:59 +0100)
author Patrick Plitzner <p.plitzner@bgbm.org>
Wed, 3 Jan 2018 08:59:54 +0000 (09:59 +0100)
committer Patrick Plitzner <p.plitzner@bgbm.org>
Wed, 3 Jan 2018 08:59:54 +0000 (09:59 +0100)
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
Simple merge
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java
Simple merge
author	Patrick Plitzner <p.plitzner@bgbm.org>
	Wed, 3 Jan 2018 08:59:54 +0000 (09:59 +0100)
committer	Patrick Plitzner <p.plitzner@bgbm.org>
	Wed, 3 Jan 2018 08:59:54 +0000 (09:59 +0100)
		1	2
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java	patch \|	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java	patch \|	diff1 \|	diff2 \|	blob \| history