Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software

# Conflicts:
#	public/js/components/filter/Filter.js
#	public/js/plugin/FhcAlert.js
#	system/filtersupdate.php

application/models/person/Kennzeichen_model.php

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