Merge origin/ci into ci

Conflicts:
	application/core/FHC_Model.php
	application/models/Nation_model.php
	application/models/lehre/Studiengang_model.php
	application/models/lehre/Studienplan_model.php

application/models/testtool/Ablauf_model.php

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

application/models/testtool/Antwort_model.php

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

application/models/testtool/Frage_model.php

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

application/models/testtool/Gebiet_model.php

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

application/models/testtool/Kategorie_model.php

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

application/models/testtool/Kriterien_model.php

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

application/models/testtool/Pruefling_model.php

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

application/models/testtool/Vorschlag_model.php

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