Merge branch 'master' into 'dev_production'

application/helpers/pis_helper.php

@@ -11,7 +11,7 @@ function set_doctor_image($path) {
 function set_upload_options($path) {   
 	$config = array();
 	$config['upload_path'] = $path;
-	$config['allowed_types'] = 'gif|jpg|png';
+	$config['allowed_types'] = 'jpeg|jpg|png';
 	$config['max_size']      = '0';
 	$config['overwrite']     = FALSE;
 	return $config;