EDIT

#5029 Implement oneclick login for remoting

Fix compile error in FeaturDistributionDetailElement

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java

Revert incorrect fix (r24331) for taxon titleCache #5018

Display URI parsing errors

Remove comments

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java

Fix compile error in FeatureDistributionDetailElement

Map preparation materials to derivation event description

Add icon for switching to advanced media view