Merge origin/master

Conflicts:
	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
	language/_____LANGUAGE_en/_____LANGUAGE_en.aod

entity/Pers_entity/entityfields/image/onValueChange.js

@@ -9,4 +9,4 @@ if (vars.get("$field.IMAGE"))
 else
 {
     vars.set("$image.changedImage", "deleted");
-}
\ No newline at end of file
+}

entity/Pers_entity/entityfields/image/valueProcess.js

@@ -6,4 +6,4 @@ import("Pers_lib");
 if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
 {   
     result.string(PersUtils.getImage(vars.get("$field.PERSID"), (vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME")).trim()));
-}
\ No newline at end of file
+}

entity/Pers_entity/recordcontainers/db/onDBUpdate.js

@@ -18,4 +18,4 @@ if (vars.exists("$image.changedImage"))
     }
 }
 
-vars.set("$image.changedImage", false);
\ No newline at end of file
+vars.set("$image.changedImage", false);

neonView/PersEdit_view/PersEdit_view.aod

@@ -18,6 +18,10 @@
       <showDrawer v="false" />
       <entityField>#ENTITY</entityField>
       <fields>
+        <entityFieldLink>
+          <name>df3ab07b-c535-4ddc-9c7b-bca80006c805</name>
+          <entityField>IMAGE</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>7a647c90-3a1c-4f8d-9ecd-6bdf35ab2f80</name>
           <entityField>ORG_ID</entityField>

process/OfferOrder_lib/process.js

@@ -750,4 +750,4 @@ ItemUtils.prototype.reOrgItems = function(table) {
             }
         }
     }
-}
\ No newline at end of file
+}