merge-update from trunk

diff --cc eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
index b1c2cf9615db35b9076dfb117a667a5a29857ab8,f0a21cf7f206e7f1e8402ee3eed167e6b10c2afb..61c72751cc72b36ce68409254b0675f6cd9f04e1
--- 1/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
@@@ -2,19 -2,10 +2,19 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: Bulkeditor Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
- Bundle-Version: 3.2.4.qualifier
+ Bundle-Version: 3.3.0.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
  Bundle-Vendor: EDIT
 -Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,eu.etaxonomy.taxeditor.annotatedlineeditor.handler,eu.etaxonomy.taxeditor.bulkeditor,eu.etaxonomy.taxeditor.bulkeditor.command,eu.etaxonomy.taxeditor.bulkeditor.handler,eu.etaxonomy.taxeditor.bulkeditor.input,eu.etaxonomy.taxeditor.bulkeditor.internal,eu.etaxonomy.taxeditor.bulkeditor.referencingobjects
 +Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
 + eu.etaxonomy.taxeditor.annotatedlineeditor.handler,
 + eu.etaxonomy.taxeditor.bulkeditor,
 + eu.etaxonomy.taxeditor.bulkeditor.command,
 + eu.etaxonomy.taxeditor.bulkeditor.handler,
 + eu.etaxonomy.taxeditor.bulkeditor.input,
 + eu.etaxonomy.taxeditor.bulkeditor.internal,
 + eu.etaxonomy.taxeditor.bulkeditor.referencingobjects,
 + eu.etaxonomy.taxeditor.dataimport,
 + eu.etaxonomy.taxeditor.dataimport.wizard
  Require-Bundle: org.eclipse.ui,
   org.eclipse.core.runtime,
   org.eclipse.ui.editors,

diff --cc eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicNewObjectMenu.java
index bc9116b1effd63741e4a27e19f5af75ab9e0632d,cf09eda13ffeb7456c33c8083f8a648d47317747..d9bbfb0bdd8ed3de61bcfc20f96bacfe43284b4a
--- 1/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicNewObjectMenu.java
--- 2/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicNewObjectMenu.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicNewObjectMenu.java
@@@ -84,10 -82,15 +85,15 @@@ public class DynamicNewObjectMenu exten
                                        logger.error("Error executing command", e);
                                        throw new RuntimeException("Error executing command", e);
                                }
 -                      }                               
 +                      }
                });
+               
+               //FIXME:3.3MC Need corresponding Details Viewer section for FieldUnit
+               if(key == SpecimenOrObservationType.FieldUnit){
+                       menuItem.setEnabled(false);
+               }
        }
 -      
 +
        /**
         * Get class label pairs from Annotated Line Editor's entity creator.
         * @return

diff --cc eu.etaxonomy.taxeditor.cdmlib/.classpath
Simple merge

diff --cc eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
Simple merge

diff --cc eu.etaxonomy.taxeditor.cdmlib/build.properties
Simple merge

diff --cc eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
Simple merge