Merge remote-tracking branch 'origin/master' into feature-25430/stammdaten_im_infocentertool_editierbar

# Conflicts:
#	application/views/system/infocenter/infocenterDetails.php

application/models/crm/Prestudent_model.php

@@ -556,7 +556,7 @@ class Prestudent_model extends DB_Model
 	 */
 	public function getOrganisationunitsByPersonId($person_id)
 	{
-		$query = 'SELECT o.oe_kurzbz,
+		$query = 'SELECT DISTINCT o.oe_kurzbz,
 						o.bezeichnung,
 						(CASE
 							WHEN sg.typ = \'b\' THEN ps.prestudent_id

application/models/person/Adressentyp_model.php

@@ -0,0 +1,14 @@
+<?php
+class Adressentyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_adressentyp';
+		$this->pk = 'adressentyp_kurzbz';
+	}
+}