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

Conflicts:
	application/config/autoload.php
	application/controllers/api/v1/Person.php
	application/models/person/Person_model.php

ci_hack.php

@@ -414,6 +414,11 @@ trait db_extra
 			return ($var!==''?$var:'null');	
 	}
 	
+	public function db_qoute($var)
+	{
+		return "'".$var."'";
+	}
+	
 	public function db_parse_bool($var)
 	{
 		if($var=='t')