Merge branch 'master' into 'dev_production'

application/models/Organizer_model.php

@@ -1134,7 +1134,7 @@ class Organizer_model extends CI_Model {
 	        'newline' => "\r\n"
         ));
         
-        $ci->email->from('[email protected]', 'TimeOut');
+        $ci->email->from('[email protected]', 'TimeOut');
         $ci->email->to($email);
         $ci->email->subject($subject);
         $ci->email->message($message);