Merge branch 'master' into permissions

application/core/FHC_Controller.php

@@ -35,4 +35,14 @@ class FHC_Controller extends CI_Controller
 			exit;
 		}
 	}
+
+	/**
+	 * Wrapper to load phrases using the PhrasesLib
+	 * NOTE: The library is loaded with the alias 'p', so must me used with this alias in the rest of the code.
+	 *		EX: $this->p->t(<category>, <phrase name>)
+	 */
+	public function loadPhrases($categories, $language = null)
+	{
+		$this->load->library('PhrasesLib', array($categories, $language), 'p');
+	}
 }