Merge origin/ci into ci

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

application/controllers/api/v1/Nation.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * FH-Complete
+ *
+ * @package		FHC-API
+ * @author		FHC-Team
+ * @copyright	Copyright (c) 2016, fhcomplete.org
+ * @license		GPLv3
+ * @link		http://fhcomplete.org
+ * @since		Version 1.0
+ * @filesource
+ */
+// ------------------------------------------------------------------------
+
+if(!defined('BASEPATH')) exit('No direct script access allowed');
+
+class Nation extends REST_Controller
+{
+	/**
+	 * Course API constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		// Load model PersonModel
+		$this->load->model('nation_model', 'NationModel');
+		// Load set the addonID of the model to let to check the permissions
+		$this->NationModel->setAddonID($this->_getAddonID());
+	}
+	
+	public function getAll()
+	{
+		$notLocked = $this->get('ohnesperre');
+		$orderEnglish = $this->get('orderEnglish');
+		
+		$result = $this->NationModel->getAll($notLocked, $orderEnglish);
+		
+		if(!is_null($result) && $result->num_rows() > 0)
+		{
+			$payload = [
+				'success'	=>	TRUE,
+				'message'	=>	'Nation found',
+				'data'		=>	$result->result()[0]
+			];
+			$httpstatus = REST_Controller::HTTP_OK;
+		}
+		else
+		{
+			$payload = [
+				'success'	=>	FALSE,
+				'message'	=>	'Nation not found'
+			];
+			$httpstatus = REST_Controller::HTTP_OK;
+		}
+		
+		$this->response($payload, $httpstatus);
+	}
+	
+	public function getFederalState()
+	{
+		$result = $this->NationModel->getFederalState();
+		
+		if(!is_null($result) && $result->num_rows() > 0)
+		{
+			$payload = [
+				'success'	=>	TRUE,
+				'message'	=>	'Bundesland found',
+				'data'		=>	$result->result_array()
+			];
+			$httpstatus = REST_Controller::HTTP_OK;
+		}
+		else
+		{
+			$payload = [
+				'success'	=>	FALSE,
+				'message'	=>	'Bundesland not found'
+			];
+			$httpstatus = REST_Controller::HTTP_OK;
+		}
+		
+		$this->response($payload, $httpstatus);
+	}
+}