diff --git a/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php b/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php
index c5673c616..b71a3b12a 100644
--- a/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php
+++ b/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php
@@ -67,10 +67,12 @@ function displayUploadForm()
     $html = "
     <div id=\"containerDataForm\">
         <form method=\"post\" enctype=\"multipart/form-data\" action=\"uploader.php?" . $_SERVER["QUERY_STRING"] . "&q=upload\" onsubmit=\"return validateForm();\">
+            <br/>
             File:&nbsp;
             <input type=\"file\" id=\"File1\" name=\"upload_file\" />&nbsp;(*.html, *.htm)
-            <br/><br/>
+            <br/>
             <input type=\"submit\" name=\"Upload File\" value=\"Upload File\" style=\"border: 1px solid #1ba385; float: right; margin-top: 30px; margin-right: -4px; font-size: 10px; display: inline-block; text-decoration: none; padding: 8px 24px; -moz-border-radius: 2px; -ms-border-radius: 2px; -o-border-radius: 2px; background-color: #1fbc99; color: white;\" />
+            <input type=\"button\" onclick=\"tinyMCEPopup.close();\"name=\"Cancel\" value=\"Cancel\" style=\"border: 1px solid #e14333; float: right; margin-top: 30px; margin-right: 8px; font-size: 10px; display: inline-block; text-decoration: none; padding: 8px 24px; -moz-border-radius: 2px; -ms-border-radius: 2px; -o-border-radius: 2px; background-color: #e4655f; color: white;\" />
         </form>
     </div>
 
diff --git a/workflow/engine/classes/class.calendar.php b/workflow/engine/classes/class.calendar.php
index 48f50b77f..24c968d2b 100755
--- a/workflow/engine/classes/class.calendar.php
+++ b/workflow/engine/classes/class.calendar.php
@@ -806,7 +806,9 @@ class calendar extends CalendarDefinition
     	if ( G::toUpper($formatDuration) == 'DAYS' ) {
     		$duration = $duration*$calendarData['HOURS_FOR_DAY'];
     	}
-    
+      if ( G::toUpper($formatDuration) == 'MINUTES' ) {
+          $duration = $duration/60;
+      }
     	$hoursDuration = (float)$duration;
     	$newDate = $iniDate;
     
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 27131d0a0..1b10c32d3 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -1358,7 +1358,7 @@ class workspaceTools
         if ( !$flag && !is_null($flagFunction) ) {
             //Replace TYPE by ENGINE
             $script = file_get_contents($filename);
-            $script = preg_replace('/\)TYPE\=|\)\sTYPE\=/', ')ENGINE=', $script);
+            $script  = preg_replace('/\)TYPE\=InnoDB|\)\sTYPE\=InnoDB/', ')ENGINE=InnoDB DEFAULT CHARSET=utf8', $script);
             file_put_contents($filename,$script);
             $aHost = explode(':',$parameters['dbHost']);
             $dbHost = $aHost[0];
@@ -1389,7 +1389,7 @@ class workspaceTools
                 $script = file_get_contents($filename);
 
                 //Replace TYPE by ENGINE
-                $script = preg_replace('/\)TYPE\=|\)\sTYPE\=/', ')ENGINE=', $script);
+                $script  = preg_replace('/\)TYPE\=InnoDB|\)\sTYPE\=InnoDB/', ')ENGINE=InnoDB DEFAULT CHARSET=utf8', $script);
                 $lines = explode("\n", $script);
                 $previous = null;
                 $insert = false;
diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index 6f436bce3..0aa3f0995 100755
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -904,12 +904,16 @@ try {
                         if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] == 'HOURS') {
                             $hoursSelected = "selected = 'selected'";
                         } else {
+                            if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] == 'MINUTES') {
+                               $minSelected = "selected = 'selected'";
+                            }
                             $daysSelected = "selected = 'selected'";
                         }
 
                         $sAux = '<select name=' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] id= ' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] >';
                         $sAux .= "<option " . $hoursSelected . " value='HOURS'>Hours</option> ";
                         $sAux .= "<option " . $daysSelected . " value='DAYS'>Days</option> ";
+                        $sAux .= "<option " . $minSelected . " value='MINUTES'>Minutes</option> ";
                         $sAux .= '</select>';
                         $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] = $sAux;
 
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
index d2ac8fba8..e16b36989 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
@@ -325,7 +325,7 @@ class Task
                 if (!isset($arrayProperty["TAS_DURATION"])) {
                     throw (new \Exception("Invalid value specified for 'tas_duration'"));
                 }
-                $valuesTimeUnit = array('DAYS','HOURS');
+                $valuesTimeUnit = array('DAYS','HOURS','MINUTES');
                 if ((!isset($arrayProperty["TAS_TIMEUNIT"])) ||
                     (!in_array($arrayProperty["TAS_TIMEUNIT"], $valuesTimeUnit))) {
                     throw (new \Exception("Invalid value specified for 'tas_timeunit'"));
diff --git a/workflow/engine/xmlform/tasks/tasks_TimingControl.xml b/workflow/engine/xmlform/tasks/tasks_TimingControl.xml
index e76b99ca2..ff97fac9a 100755
--- a/workflow/engine/xmlform/tasks/tasks_TimingControl.xml
+++ b/workflow/engine/xmlform/tasks/tasks_TimingControl.xml
@@ -10,7 +10,7 @@
     <en><![CDATA[Task duration]]></en>
   </TAS_DURATION>
   <TAS_TIMEUNIT type="dropdown" defaultvalue="DAYS" group="1">
-    <en><![CDATA[Time unit]]><option name="HOURS"><![CDATA[Hours]]></option><option name="DAYS"><![CDATA[Days]]></option></en>
+    <en><![CDATA[Time unit]]><option name="HOURS"><![CDATA[Hours]]></option><option name="DAYS"><![CDATA[Days]]></option><option name="MINUTES"><![CDATA[Minutes]]></option></en>
   </TAS_TIMEUNIT>
   <TAS_TYPE_DAY type="dropdown" defaultvalue="1" group="1">
     <en><![CDATA[Count days by]]><option name="1"><![CDATA[Work Days]]></option><option name="2"><![CDATA[Calendar Days]]></option></en>