Merge origin/ci into ci

Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php

application/models/Nation_model.php

@@ -0,0 +1,71 @@
+<?php
+
+class Nation_model extends DB_Model
+{
+	protected $_federalStateQuery = "SELECT * FROM bis.tbl_bundesland";
+	
+	/**
+	 * 
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
+	
+	/**
+	 * 
+	 */
+	public function getAll($notLocked = FALSE, $orderEnglish = FALSE)
+	{
+		$result = NULL;
+		
+		// Checks if the operation is permitted by the API caller
+		// All the code should be put inside this if statement
+		if($this->_checkPermissions())
+		{
+			$result = $this->db->query($this->_getNationQuery($notLocked, $orderEnglish));
+		}
+		
+		return $result;
+	}
+	
+	/**
+	 * 
+	 */
+	protected function _getNationQuery($notLocked = FALSE, $orderEnglish = FALSE)
+	{
+		$qry = "SELECT * FROM bis.tbl_nation";
+		
+		if($notLocked)
+		{
+			$qry .= " WHERE sperre is null";
+		}
+		if(!$orderEnglish)
+		{
+			$qry .= " ORDER BY kurztext";
+		}
+		else
+		{
+			$qry .= " ORDER BY engltext";
+		}
+		
+		return $qry;
+	}
+	
+	/**
+	 * 
+	 */
+	public function getFederalState()
+	{
+		$result = NULL;
+		
+		// Checks if the operation is permitted by the API caller
+		// All the code should be put inside this if statement
+		if($this->_checkPermissions())
+		{
+			$result = $this->db->query($this->_federalStateQuery);
+		}
+		
+		return $result;
+	}
+}