Merge branch 'master' into 'dev_production'

application/helpers/access_helper.php

@@ -34,7 +34,7 @@ else{
 function get_settings(){
 	$CI = & get_instance();
 	$query = $CI->db->where('settings',array('id'=>'1'))->row();
-	return $query
+	return $query;
 }