Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci

Conflicts:
	application/core/FHC_Model.php

application/widgets/navigation.php

@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * Demo widget
+ */
+class Navigation extends Widget {
+
+    public function display($data) {
+        
+        if (!isset($data['items'])) {
+            $data['items'] = array('Home', 'About', 'Contact');
+        }
+
+        $this->view('widgets/navigation', $data);
+    }
+    
+}