Merge branch 'develop' into feature/cdm-4.7

Conflicts:
	cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java

diff --cc cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java
index 250e1031f01ad29b00e40c69fd0af1ac177f899c,10ae6e06290c97b563f09d8b22adb85176b9206e..77d6a88b5ec4599864df96f307f33ac3cc9183fb
--- 1/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java
--- 2/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java
@@@ -209,15 -223,15 +209,15 @@@ public class Feature extends DefinedTer
         * Creates a new feature instance with a description (in the {@link Language#DEFAULT() default language}),
         * a label and a label abbreviation.
         *
--       * @param       term             the string (in the default language) describing the
++       * @param       description      the string (in the default language) describing the
         *                                               new feature to be created
         * @param       label            the string identifying the new feature to be created
--       * @param       labelAbbrev  the string identifying (in abbreviated form) the
++       * @param       labelAbbrev      the string identifying (in abbreviated form) the
         *                                               new feature to be created
         * @see                                  #readCsvLine(List, Language)
         * @see                                  #NewInstance()
         */
--      public static Feature NewInstance(String term, String label, String labelAbbrev){
++      public static Feature NewInstance(String description, String label, String labelAbbrev){
                return new Feature(term, label, labelAbbrev);
        }