Merge branch 'master' into 'dev_production'

application/controllers/Webservices.php

@@ -1002,7 +1002,6 @@
 					$fcm_data['booking_id'] = $postData['booking_id'];
 					$fcm_data['device_id'] = $respData['data']['device_id'];
 					$fcm_data['service_type'] = $respData['data']['service_type'];
-					unset($respData['data']['device_id']);
 					$this->push_sent_cancel($fcm_data);
 				}
 			}