Merge branch 'master' into 'dev_production'

application/models/Webservice_model.php

@@ -1900,7 +1900,7 @@ class Webservice_model extends CI_Model {
 							   CUST.customer_id,CAUTH.auth_token AS fcm_token
 						FROM customer AS CUST
 						INNER JOIN customer_auth AS CAUTH ON (CAUTH.user_id=CUST.customer_id)
-						WHERE CUST.customer_id='2'";
+						WHERE CUST.customer_id='$fromUsrId'";
 				$cust = $this->db->query($sql);
 				if(!empty($cust) && !empty($cust = $cust->row_array())){
 					$custData[] = $cust;