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/core/FHC_Model.php

@@ -3,7 +3,6 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 
 class FHC_Model extends CI_Model
 {
-	//protected errormsg;
 	function __construct()
 	{
 		parent::__construct();
@@ -55,4 +54,4 @@ class FHC_Model extends CI_Model
 		$return->retval = $retval;
 		return $return;
 	}
-}
+}