Merge remote-tracking branch 'origin' into remoting-4.0

Merge remote-tracking branch 'origin' into remoting-4.0

Conflicts:
	eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.application/pom.xml
	eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.bulkeditor/pom.xml
	eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.cdmlib/pom.xml
	eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.editor/pom.xml
	eu.etaxonomy.taxeditor.feature.platform/feature.xml
	eu.etaxonomy.taxeditor.feature.platform/pom.xml
	eu.etaxonomy.taxeditor.feature/feature.xml
	eu.etaxonomy.taxeditor.feature/pom.xml
	eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.help/pom.xml
	eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.navigation/pom.xml
	eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.printpublisher/pom.xml
	eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.store/pom.xml
	eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
	eu.etaxonomy.taxeditor/pom.xml
	pom.xml