Merge branch 'master' into 'dev_production'

application/controllers/Webservice.php

@@ -154,7 +154,7 @@ class Webservice extends CI_Controller {
 
 
     public function get_category_list($query = null) {
-    $data['query'] = $_GET['query'];
+    $data['query'] = !empty($_GET['query']) ? $_GET['query'] : '';
     $data['auth_token'] = $this->auth_token;
     $res = $this->Webservice_model->get_category_list($data);
     if($res['status']!=0){