Merge branch 'master' into 'dev_production'

application/controllers/Webservices.php

@@ -203,7 +203,7 @@ public function fb_login_post(){
 			
 
 			   	if($res){
-    		$result = array( 'status' => 'success','message'=>'Email Sent Succesfully','data'=>'');
+    		$result = array( 'status' => 'success','message'=>'New Password is Sent To Your Email','data'=>'');
     	} else {   		
     		$result = array( 'status' => 'error','message' =>'Sorry. Invalid email.','data'=>'');
     	}

application/models/Webservice_model.php

@@ -502,7 +502,7 @@ public function forgot_mails($data,$rand_pwd){
          $this->email->subject("Forgot Password - Tukkibi");
          $this->email->message("Hi ".$data->name.", Your New Password is : ".$rand_pwd);  
          $this->email->send();
-         echo $this->email->print_debugger();
+         //echo $this->email->print_debugger();
          return "EmailSend";
       // } 
     /* }else {