Merge branch 'master' into 'dev_production'

application/controllers/Webservices.php

@@ -85,7 +85,7 @@ header('Content-Type: text/html; charset=utf-8');
     	 
 		 
 		// $body = "OTP for JoyRide account signup is:".$request['otp'];
-		// $email = $request['email'];
+		 $email = $request['email'];
 		// $name = $data['first_name'].' '.$data['last_name']; 
 		// $sub = 'OTP Verification';
 		// $this->send_mail($email,$sub,$body,$name);

index.php

@@ -55,7 +55,7 @@ date_default_timezone_set("Asia/Kolkata");
  *
  * NOTE: If you change these, also change the error_reporting() code below
  */
-	define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'development');
+	define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'production');
 
 /*
  *---------------------------------------------------------------