Merge branch 'develop' into LibrAlign

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

Mon, 23 Jan 2017 11:49:40 +0000 (12:49 +0100)

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

Mon, 23 Jan 2017 11:49:40 +0000 (12:49 +0100)
author Patrick Plitzner <p.plitzner@bgbm.org>
Mon, 23 Jan 2017 11:49:40 +0000 (12:49 +0100)
committer Patrick Plitzner <p.plitzner@bgbm.org>
Mon, 23 Jan 2017 11:49:40 +0000 (12:49 +0100)
diff --cc eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
Simple merge
diff --cc eu.etaxonomy.taxeditor.molecular.lib/pom.xml
Simple merge
author	Patrick Plitzner <p.plitzner@bgbm.org>
	Mon, 23 Jan 2017 11:49:40 +0000 (12:49 +0100)
committer	Patrick Plitzner <p.plitzner@bgbm.org>
	Mon, 23 Jan 2017 11:49:40 +0000 (12:49 +0100)
		1	2
eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF	patch \|	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.molecular.lib/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history