diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php
index 868c819b1..94d59a029 100755
--- a/workflow/engine/classes/class.configuration.php
+++ b/workflow/engine/classes/class.configuration.php
@@ -659,14 +659,14 @@ class Configurations // extends Configuration
                 $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center");
                 $caseColumns[] = array("header" => "UserUid", "dataIndex" => "USR_UID", "width" => 50, "hidden" => true, "hideable" => false);
                 $caseColumns[] = array("header" => "PreUsrUid", "dataIndex" => "PREVIOUS_USR_UID", "width" => 50, "hidden" => true, "hideable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_DUE_DATE") : "**ID_DUE_DATE**", "dataIndex" => "DEL_TASK_DUE_DATE", "width" => 110);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "**ID_LAST_MODIFY**", "dataIndex" => "APP_UPDATE_DATE", "width" => 110);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PRIORITY") : "**ID_PRIORITY**", "dataIndex" => "DEL_PRIORITY", "width" => 50);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "ID_SUMMARY", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "ID_CASES_NOTES", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "ID_CASE", "dataIndex" => "APP_TITLE", "width" => 150);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "ID_PROCESS", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "ID_TASK", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_DUE_DATE") : "ID_DUE_DATE", "dataIndex" => "DEL_TASK_DUE_DATE", "width" => 110);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "ID_LAST_MODIFY", "dataIndex" => "APP_UPDATE_DATE", "width" => 110);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PRIORITY") : "ID_PRIORITY", "dataIndex" => "DEL_PRIORITY", "width" => 50);
 
                 $caseReaderFields[] = array("name" => "APP_UID");
                 $caseReaderFields[] = array("name" => "USR_UID");
@@ -690,15 +690,15 @@ class Configurations // extends Configuration
             case "paused":
                 $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center");
                 $caseColumns[] = array("header" => "UserUid", "dataIndex" => "USR_UID", "width" => 50, "hidden" => true, "hideable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SENT_BY") : "**ID_SENT_BY**", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "**ID_LAST_MODIFY**", "dataIndex" => "APP_UPDATE_DATE", "width" => 80);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_THREAD_INDEX") : "**ID_THREAD_INDEX**", "dataIndex" => "APP_THREAD_INDEX", "width" => 80);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_DEL_INDEX") : "**ID_DEL_INDEX**", "dataIndex" => "DEL_INDEX", "width" => 80);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "ID_SUMMARY", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "ID_CASES_NOTES", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "ID_CASE", "dataIndex" => "APP_TITLE", "width" => 150);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "ID_PROCESS", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "ID_TASK", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SENT_BY") : "ID_SENT_BY", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "ID_LAST_MODIFY", "dataIndex" => "APP_UPDATE_DATE", "width" => 80);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_THREAD_INDEX") : "ID_THREAD_INDEX", "dataIndex" => "APP_THREAD_INDEX", "width" => 80);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_DEL_INDEX") : "ID_DEL_INDEX", "dataIndex" => "DEL_INDEX", "width" => 80);
 
                 $caseReaderFields[] = array("name" => "APP_UID");
                 $caseReaderFields[] = array("name" => "USR_UID");
@@ -726,16 +726,16 @@ class Configurations // extends Configuration
             case "unassigned":
                 $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center");
                 $caseColumns[] = array("header" => "UserUid", "dataIndex" => "USR_UID", "width" => 50, "hidden" => true, "hideable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SENT_BY") : "**ID_SENT_BY**", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_DUE_DATE") : "**ID_DUE_DATE**", "dataIndex" => "DEL_TASK_DUE_DATE", "width" => 110);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "**ID_LAST_MODIFY**", "dataIndex" => "APP_UPDATE_DATE", "width" => 80);
-                //$caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_COMPLETED_BY_USER") : "**ID_COMPLETED_BY_USER**", "dataIndex" => "APP_CURRENT_USER", "width" => 110);
-                //$caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_FINISH_DATE") : "**ID_FINISH_DATE**", "dataIndex" => "APP_FINISH_DATE", "width" => 50);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "ID_SUMMARY", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "ID_CASES_NOTES", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "ID_CASE", "dataIndex" => "APP_TITLE", "width" => 150);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "ID_PROCESS", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "ID_TASK", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SENT_BY") : "ID_SENT_BY", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_DUE_DATE") : "ID_DUE_DATE", "dataIndex" => "DEL_TASK_DUE_DATE", "width" => 110);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "ID_LAST_MODIFY", "dataIndex" => "APP_UPDATE_DATE", "width" => 80);
+                //$caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_COMPLETED_BY_USER") : "ID_COMPLETED_BY_USER", "dataIndex" => "APP_CURRENT_USER", "width" => 110);
+                //$caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_FINISH_DATE") : "ID_FINISH_DATE", "dataIndex" => "APP_FINISH_DATE", "width" => 50);
 
                 $caseReaderFields[] = array("name" => "APP_UID");
                 $caseReaderFields[] = array("name" => "USR_UID");
@@ -764,14 +764,14 @@ class Configurations // extends Configuration
                 $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center");
                 $caseColumns[] = array("header" => "UserUid", "dataIndex" => "USR_UID", "width" => 50, "hidden" => true, "hideable" => false);
                 $caseColumns[] = array("header" => "PreUsrUid", "dataIndex" => "PREVIOUS_USR_UID", "width" => 50, "hidden" => true, "hideable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CURRENT_USER") : "**ID_CURRENT_USER**", "dataIndex" => "APP_CURRENT_USER", "width" => 120, "sortable" => true);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "**ID_LAST_MODIFY**", "dataIndex" => "APP_UPDATE_DATE", "width" => 80);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_STATUS") : "**ID_STATUS**", "dataIndex" => "APP_STATUS_LABEL", "width" => 50);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "ID_SUMMARY", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "ID_CASES_NOTES", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "ID_CASE", "dataIndex" => "APP_TITLE", "width" => 150);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "ID_PROCESS", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "ID_TASK", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CURRENT_USER") : "ID_CURRENT_USER", "dataIndex" => "APP_CURRENT_USER", "width" => 120, "sortable" => true);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "ID_LAST_MODIFY", "dataIndex" => "APP_UPDATE_DATE", "width" => 80);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_STATUS") : "ID_STATUS", "dataIndex" => "APP_STATUS_LABEL", "width" => 50);
 
                 $caseReaderFields[] = array("name" => "APP_UID");
                 $caseReaderFields[] = array("name" => "USR_UID");
@@ -800,17 +800,17 @@ class Configurations // extends Configuration
                 $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center");
                 $caseColumns[] = array("header" => "UserUid", "dataIndex" => "USR_UID", "width" => 50, "hidden" => true, "hideable" => false);
                 $caseColumns[] = array("header" => "PreUsrUid", "dataIndex" => "PREVIOUS_USR_UID", "width" => 50, "hidden" => true, "hideable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
-                //$caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SENT_BY") : "**ID_SENT_BY**", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 120 );
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CURRENT_USER") : "**ID_CURRENT_USER**", "dataIndex" => "APP_CURRENT_USER", "width" => 120, "sortable" => true);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "**ID_LAST_MODIFY**", "dataIndex" => "APP_UPDATE_DATE", "width" => 80);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_DELEGATION_DATE") : "**ID_DELEGATION_DATE**", "dataIndex" => "DEL_DELEGATE_DATE", "width" => 80);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_DUE_DATE") : "**ID_DUE_DATE**", "dataIndex" => "DEL_TASK_DUE_DATE", "width" => 80);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_STATUS") : "**ID_STATUS**", "dataIndex" => "APP_STATUS_LABEL", "width" => 50);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "ID_SUMMARY", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "ID_CASES_NOTES", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "ID_CASE", "dataIndex" => "APP_TITLE", "width" => 150);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "ID_PROCESS", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "ID_TASK", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
+                //$caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SENT_BY") : "ID_SENT_BY", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 120 );
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CURRENT_USER") : "ID_CURRENT_USER", "dataIndex" => "APP_CURRENT_USER", "width" => 120, "sortable" => true);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "ID_LAST_MODIFY", "dataIndex" => "APP_UPDATE_DATE", "width" => 80);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_DELEGATION_DATE") : "ID_DELEGATION_DATE", "dataIndex" => "DEL_DELEGATE_DATE", "width" => 80);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_DUE_DATE") : "ID_DUE_DATE", "dataIndex" => "DEL_TASK_DUE_DATE", "width" => 80);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_STATUS") : "ID_STATUS", "dataIndex" => "APP_STATUS_LABEL", "width" => 50);
 
                 $caseReaderFields[] = array("name" => "APP_UID");
                 $caseReaderFields[] = array("name" => "USR_UID");
@@ -836,17 +836,17 @@ class Configurations // extends Configuration
                 $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center");
                 $caseColumns[] = array("header" => "UserUid", "dataIndex" => "USR_UID", "width" => 50, "hidden" => true, "hideable" => false);
                 $caseColumns[] = array("header" => "PreUsrUid", "dataIndex" => "PREVIOUS_USR_UID", "width" => 50, "hidden" => true, "hideable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SENT_BY") : "**ID_SENT_BY**", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CURRENT_USER") : "**ID_CURRENT_USER**", "dataIndex" => "APP_CURRENT_USER", "width" => 90, "sortable" => true);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "ID_SUMMARY", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "ID_CASES_NOTES", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "ID_CASE", "dataIndex" => "APP_TITLE", "width" => 150);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "ID_PROCESS", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "ID_TASK", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SENT_BY") : "ID_SENT_BY", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CURRENT_USER") : "ID_CURRENT_USER", "dataIndex" => "APP_CURRENT_USER", "width" => 90, "sortable" => true);
                 //$caseColumns[] = array("header" => "Sent By", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
-                //$caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_LAST_MODIFY") : "**ID_LAST_MODIFY**", "dataIndex" => "APP_UPDATE_DATE", "width" => 110);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PRIORITY") : "**ID_PRIORITY**", "dataIndex" => "DEL_PRIORITY", "width" => 50);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_STATUS") : "**ID_STATUS**", "dataIndex" => "APP_STATUS_LABEL", "width" => 50);
+                //$caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_LAST_MODIFY") : "ID_LAST_MODIFY", "dataIndex" => "APP_UPDATE_DATE", "width" => 110);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PRIORITY") : "ID_PRIORITY", "dataIndex" => "DEL_PRIORITY", "width" => 50);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_STATUS") : "ID_STATUS", "dataIndex" => "APP_STATUS_LABEL", "width" => 50);
 
                 $caseReaderFields[] = array("name" => "APP_UID");
                 $caseReaderFields[] = array("name" => "USR_UID");
@@ -874,15 +874,15 @@ class Configurations // extends Configuration
                 $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center");
                 $caseColumns[] = array("header" => "UserUid", "dataIndex" => "USR_UID", "width" => 50, "hidden" => true, "hideable" => false);
                 $caseColumns[] = array("header" => "PreUsrUid", "dataIndex" => "PREVIOUS_USR_UID", "width" => 50, "hidden" => true, "hideable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CURRENT_USER") : "**ID_CURRENT_USER**", "dataIndex" => "APP_CURRENT_USER", "width" => 90, "sortable" => true);
-                //$caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SENT_BY") : "**ID_SENT_BY**", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "**ID_LAST_MODIFY**", "dataIndex" => "APP_UPDATE_DATE", "width" => 110);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_STATUS") : "**ID_STATUS**", "dataIndex" => "APP_STATUS_LABEL", "width" => 50);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "ID_SUMMARY", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "ID_CASES_NOTES", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "ID_CASE", "dataIndex" => "APP_TITLE", "width" => 150);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "ID_PROCESS", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "ID_TASK", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CURRENT_USER") : "ID_CURRENT_USER", "dataIndex" => "APP_CURRENT_USER", "width" => 90, "sortable" => true);
+                //$caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SENT_BY") : "ID_SENT_BY", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "ID_LAST_MODIFY", "dataIndex" => "APP_UPDATE_DATE", "width" => 110);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_STATUS") : "ID_STATUS", "dataIndex" => "APP_STATUS_LABEL", "width" => 50);
 
                 $caseReaderFields[] = array("name" => "TAS_UID");
                 $caseReaderFields[] = array("name" => "DEL_INDEX");
@@ -904,15 +904,15 @@ class Configurations // extends Configuration
                 $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center");
                 $caseColumns[] = array("header" => "UserUid", "dataIndex" => "USR_UID", "width" => 50, "hidden" => true, "hideable" => false);
                 $caseColumns[] = array("header" => "PreUsrUid", "dataIndex" => "PREVIOUS_USR_UID", "width" => 50, "hidden" => true, "hideable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CURRENT_USER") : "**ID_CURRENT_USER**", "dataIndex" => "APP_CURRENT_USER", "width" => 90, "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SENT_BY") : "**ID_SENT_BY**", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "**ID_LAST_MODIFY**", "dataIndex" => "APP_UPDATE_DATE", "width" => 110);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_STATUS") : "**ID_STATUS**", "dataIndex" => "APP_STATUS_LABEL", "width" => 50);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "ID_SUMMARY", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "ID_CASES_NOTES", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "ID_CASE", "dataIndex" => "APP_TITLE", "width" => 150);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "ID_TASK", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "ID_PROCESS", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CURRENT_USER") : "ID_CURRENT_USER", "dataIndex" => "APP_CURRENT_USER", "width" => 90, "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SENT_BY") : "ID_SENT_BY", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "ID_LAST_MODIFY", "dataIndex" => "APP_UPDATE_DATE", "width" => 110);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_STATUS") : "ID_STATUS", "dataIndex" => "APP_STATUS_LABEL", "width" => 50);
 
                 $caseReaderFields[] = array("name" => "APP_UID");
                 $caseReaderFields[] = array("name" => "USR_UID");
@@ -933,15 +933,15 @@ class Configurations // extends Configuration
                 //todo
                 $caseColumns[] = array("header" => "#", "dataIndex" => "APP_NUMBER", "width" => 45, "align" => "center");
                 $caseColumns[] = array("header" => "UserUid", "dataIndex" => "USR_UID", "width" => 50, "hidden" => true, "hideable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "**ID_SUMMARY**", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "**ID_CASES_NOTES**", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SENT_BY") : "**ID_SENT_BY**", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_DUE_DATE") : "**ID_DUE_DATE**", "dataIndex" => "DEL_TASK_DUE_DATE", "width" => 110);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "**ID_LAST_MODIFY**", "dataIndex" => "APP_UPDATE_DATE", "width" => 110);
-                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PRIORITY") : "**ID_PRIORITY**", "dataIndex" => "DEL_PRIORITY", "width" => 50);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SUMMARY") : "ID_SUMMARY", "dataIndex" => "CASE_SUMMARY", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASES_NOTES") : "ID_CASES_NOTES", "dataIndex" => "CASE_NOTES_COUNT", "width" => 45, "align" => "center", "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CASE") : "ID_CASE", "dataIndex" => "APP_TITLE", "width" => 150);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PROCESS") : "ID_PROCESS", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "ID_TASK", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_SENT_BY") : "ID_SENT_BY", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_DUE_DATE") : "ID_DUE_DATE", "dataIndex" => "DEL_TASK_DUE_DATE", "width" => 110);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "ID_LAST_MODIFY", "dataIndex" => "APP_UPDATE_DATE", "width" => 110);
+                $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_PRIORITY") : "ID_PRIORITY", "dataIndex" => "DEL_PRIORITY", "width" => 50);
 
                 $caseReaderFields[] = array("name" => "APP_UID");
                 $caseReaderFields[] = array("name" => "USR_UID");
diff --git a/workflow/engine/classes/class.license.app.php b/workflow/engine/classes/class.license.app.php
index 9dc09eed8..b04f322cf 100644
--- a/workflow/engine/classes/class.license.app.php
+++ b/workflow/engine/classes/class.license.app.php
@@ -59,11 +59,15 @@ class license_application extends padl
      * */
     public function license_application($license_path = 'license.dat', $use_mcrypt = true, $use_time = true, $use_server = true, $allow_local = false, $challenge = false)
     {
-        # check to see if the class has been secured
-        unset($_SESSION['__sw__']);
-        if ($challenge) {
-            $_SESSION['__sw__'] = true;
+        //Check to see if the class has been secured
+        if (isset($_SESSION)) {
+            unset($_SESSION["__sw__"]);
+
+            if ($challenge) {
+                $_SESSION["__sw__"] = true;
+            }
         }
+
         $this->_check_secure();
         $this->_LICENSE_PATH = $license_path;
         $this->init($use_mcrypt, $use_time, $use_server, $allow_local);
diff --git a/workflow/engine/classes/class.pmTable.php b/workflow/engine/classes/class.pmTable.php
index c7067c7c0..0d1748964 100755
--- a/workflow/engine/classes/class.pmTable.php
+++ b/workflow/engine/classes/class.pmTable.php
@@ -289,6 +289,14 @@ class PmTable
                 $columnNode->setAttribute( 'size', $column->field_size );
             }
 
+            if ($column->field_type == 'DECIMAL') {
+                if ($column->field_size > 2) {
+                    $columnNode->setAttribute( 'scale', 2 );
+                } else {
+                    $columnNode->setAttribute( 'scale', 1 );
+                }
+            }
+
             $columnNode->setAttribute( 'required', ($column->field_null ? 'false' : 'true') );
 
             // only define the primaryKey attribute if it is defined
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 4063f0634..e949db059 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -64,7 +64,7 @@ class workspaceTools
     {
         $start = microtime(true);
         CLI::logging("> Verify enterprise old...\n");
-        $this->verifyEnterprise($workSpace);
+        $this->verifyFilesOldEnterprise($workSpace);
         $stop = microtime(true);
         $final = $stop - $start;
         CLI::logging("<*>   Verify took $final seconds.\n");
@@ -1529,8 +1529,8 @@ class workspaceTools
             CLI::logging(CLI::info("$versionOld < $versionPresent") . "\n");
 
             $start = microtime(true);
-            CLI::logging("> Verify enterprise old...\n");
-            $workspace->verifyEnterprise($workspaceName);
+            CLI::logging("> Verify files enterprise old...\n");
+            $workspace->verifyFilesOldEnterprise($workspaceName);
             $stop = microtime(true);
             $final = $stop - $start;
             CLI::logging("<*>   Verify took $final seconds.\n");
@@ -1543,6 +1543,13 @@ class workspaceTools
                 $final = $stop - $start;
                 CLI::logging("<*>   Database Upgrade Process took $final seconds.\n");
             }
+            $start = microtime(true);
+            CLI::logging("> Verify License Enterprise...\n");
+            $workspace->verifyLicenseEnterprise($workspaceName);
+            $stop = microtime(true);
+            $final = $stop - $start;
+            CLI::logging("<*>   Verify took $final seconds.\n");
+
             $start = microtime(true);
             CLI::logging("> Updating cache view...\n");
             $workspace->upgradeCacheView(true, false, $lang);
@@ -1677,7 +1684,7 @@ class workspaceTools
         return true;
     }
 
-    public function verifyEnterprise ($workspace)
+    public function verifyFilesOldEnterprise ($workspace)
     {
         $this->initPropel( true );
         $pathBackup = PATH_DATA . 'backups';
@@ -1731,5 +1738,28 @@ class workspaceTools
             }
         }
     }
+
+    public function verifyLicenseEnterprise ($workspace)
+    {
+        $this->initPropel( true );
+
+        require_once ("classes/model/LicenseManager.php");
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->add(LicenseManagerPeer::LICENSE_STATUS, 'ACTIVE');
+        $oDataset = LicenseManagerPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $row = array();
+        if ($oDataset->next()) {
+            $row = $oDataset->getRow();
+
+            $tr = LicenseManagerPeer::retrieveByPK ( $row['LICENSE_UID'] );
+            $pos = strpos( $row['LICENSE_PATH'], 'license_' );
+            $license = substr( $row['LICENSE_PATH'], $pos, strlen($row['LICENSE_PATH']));
+            $tr->setLicensePath   ( PATH_DATA . "sites/" . $workspace . "/licenses/" . $license);
+            $tr->setLicenseWorkspace ( $workspace );
+
+            $res = $tr->save ();
+        }
+    }
 }
 
diff --git a/workflow/engine/classes/model/AddonsStore.php b/workflow/engine/classes/model/AddonsStore.php
index 132b26a9b..051f32163 100644
--- a/workflow/engine/classes/model/AddonsStore.php
+++ b/workflow/engine/classes/model/AddonsStore.php
@@ -426,25 +426,27 @@ class AddonsStore extends BaseAddonsStore
             }
         } else {
             $list = unserialize($pmLicenseManagerO->licensedfeaturesList);
-            foreach ($list['addons'] as $key => $feature) {
-                $addon = new AddonsManager();
-                $addon->setAddonId($feature['name']);
-                $addon->setStoreId($feature['guid']);
-                $addon->setAddonName($feature['name']);
-                $addon->setAddonDescription($feature['description']);
-                $addon->setAddonNick($feature['nick']);
-                $addon->setAddonVersion("");
-                $addon->setAddonStatus($feature['status']);
-                $addon->setAddonType("features");
-                $addon->setAddonPublisher("Colosa");
-                $addon->setAddonDownloadUrl("");
-                $addon->setAddonDownloadMd5("");
-                $addon->setAddonReleaseDate(null);
-                $addon->setAddonReleaseType('localRegistry');
-                $addon->setAddonReleaseNotes("");
-                $addon->setAddonState("");
+            if (is_array($list)) {
+                foreach ($list['addons'] as $key => $feature) {
+                    $addon = new AddonsManager();
+                    $addon->setAddonId($feature['name']);
+                    $addon->setStoreId($feature['guid']);
+                    $addon->setAddonName($feature['name']);
+                    $addon->setAddonDescription($feature['description']);
+                    $addon->setAddonNick($feature['nick']);
+                    $addon->setAddonVersion("");
+                    $addon->setAddonStatus($feature['status']);
+                    $addon->setAddonType("features");
+                    $addon->setAddonPublisher("Colosa");
+                    $addon->setAddonDownloadUrl("");
+                    $addon->setAddonDownloadMd5("");
+                    $addon->setAddonReleaseDate(null);
+                    $addon->setAddonReleaseType('localRegistry');
+                    $addon->setAddonReleaseNotes("");
+                    $addon->setAddonState("");
 
-                $addon->save();
+                    $addon->save();
+                }
             }
         }
 
diff --git a/workflow/engine/classes/model/AppCacheView.php b/workflow/engine/classes/model/AppCacheView.php
index 8e7b5ab3a..84606fcb7 100755
--- a/workflow/engine/classes/model/AppCacheView.php
+++ b/workflow/engine/classes/model/AppCacheView.php
@@ -890,7 +890,7 @@ class AppCacheView extends BaseAppCacheView
             return $oCriteria;
         } else {
             //This list do not have a PMTable
-            if (is_array($this->confCasesList) && count($this->confCasesList["second"]["data"]) > 0) {
+            if (is_array($this->confCasesList) && isset($this->confCasesList["second"]) && count($this->confCasesList["second"]["data"]) > 0) {
                 foreach ($this->confCasesList["second"]["data"] as $fieldData) {
                     if (in_array($fieldData["name"], $defaultFields)) {
                         switch ($fieldData["fieldType"]) {
diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index a84047818..338607e0a 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -121,9 +121,9 @@ class adminProxy extends HttpProxyController
         $this->restart = $restart;
         $this->url     = "/sys" . SYS_SYS . "/" . (($sysConf["default_lang"] != "")? $sysConf["default_lang"] : ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en")) . "/" . $sysConf["default_skin"] . $urlPart;
         $this->message = 'Saved Successfully';
-        $msg = "";        
+        $msg = "";
         if($httpData->proxy_host != '' || $httpData->proxy_port != '' || $httpData->proxy_user != '') {
-            $msg = " Host -> ".$httpData->proxy_host." Port -> ".$httpData->proxy_port." User -> ".$httpData->proxy_user; 
+            $msg = " Host -> ".$httpData->proxy_host." Port -> ".$httpData->proxy_port." User -> ".$httpData->proxy_user;
         }
 
         G::auditLog("UploadSystemSettings", "Time Zone -> ".$httpData->time_zone." Memory Limit -> ".$httpData->memory_limit."  Cookie lifetime -> ".$httpData->max_life_time." Default Skin -> ".$httpData->default_skin." Default Language -> ". $httpData->default_lang. $msg);
@@ -178,7 +178,7 @@ class adminProxy extends HttpProxyController
         $httpData=array_unique((array)$httpData);
         $message = '';
         $oldName = isset($_POST['oldName'])? $_POST['oldName']:'';
-
+        
         switch ($_POST['action']){
             case 'calendarName':
                 require_once ('classes/model/CalendarDefinition.php');
@@ -193,14 +193,10 @@ class adminProxy extends HttpProxyController
                         break;
                     }
                     if (isset($aDefinitions['CALENDAR_NAME'])) {
-                        if ($aDefinitions['CALENDAR_NAME'] != $_POST['name']) {
-                            $validated = true;
-                        } else {
-                            if ($aDefinitions['CALENDAR_NAME'] != $oldName) {
-                                $validated = false;
-                                $message  = G::loadTranslation('ID_CALENDAR_INVALID_NAME');
-                                break;
-                            }
+                        if ($aDefinitions['CALENDAR_NAME'] == $_POST['name']) {
+                            $validated = false;
+                            $message  = G::loadTranslation('ID_CALENDAR_INVALID_NAME');
+                            break;
                         }
                     }
                 }
@@ -654,6 +650,7 @@ class adminProxy extends HttpProxyController
         $oSpool->sendMail();
         $G_PUBLISH = new Publisher();
 
+        $o = new stdclass();
         if ($oSpool->status == 'sent') {
             $o->status = true;
             $o->success = true;
@@ -1073,7 +1070,7 @@ class adminProxy extends HttpProxyController
             }
         } elseif ($_FILES['img']['type'] != '') {
             $failed = "1";
-        }        
+        }
         echo '{success: true, failed: ' . $failed . ', uploaded: ' . $uploaded . ', type: "' . $_FILES['img']['type'] . '"}';
         exit();
     }
diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/dashboard.php
index 776c881e3..778328865 100644
--- a/workflow/engine/controllers/dashboard.php
+++ b/workflow/engine/controllers/dashboard.php
@@ -154,7 +154,7 @@ class Dashboard extends Controller
     }
 
     public function renderDashletInstance ($data)
-    {   
+    {
         try {
             if (! isset( $data->DAS_INS_UID )) {
                 $data->DAS_INS_UID = '';
@@ -211,7 +211,7 @@ class Dashboard extends Controller
     }
 
     public function getDashletsInstances ($data)
-    {   
+    {
         $this->setResponseType( 'json' );
         $result = new stdclass();
         $result->status = 'OK';
@@ -241,7 +241,7 @@ class Dashboard extends Controller
             }
             $dashlets = $this->getDashlets();
             $this->setJSVar( 'storeDasUID', $dashlets );
-            
+
             if ($data->DAS_INS_UID != '') {
                 $this->pmDashlet->setup( $data->DAS_INS_UID );
                 $this->setJSVar( 'dashletInstance', $this->pmDashlet->getDashletInstance() );
@@ -446,12 +446,12 @@ class Dashboard extends Controller
             while ($row = $dataset->getRow()) {
                 if (strstr($row['DAS_TITLE'], '*')) {
                     $row['DAS_TITLE'] = str_replace('*', '', $row['DAS_TITLE']);
-                    $row['DAS_TITLE'] = G::LoadTranslationPlugin('advancedDashboards', $row['DAS_TITLE']);          
+                    $row['DAS_TITLE'] = G::LoadTranslationPlugin('advancedDashboards', $row['DAS_TITLE']);
                 }
 
                 if ($this->pmDashlet->verifyPluginDashlet($row['DAS_CLASS'])) {
                     $dashlets[] = array ($row['DAS_UID'],$row['DAS_TITLE']);
-                
+
                 }
                 $dataset->next();
             }
@@ -462,5 +462,31 @@ class Dashboard extends Controller
         return $dashlets;
     }
 
+    public function verifyTitleDashlet ($data)
+    {
+        $this->setResponseType("json");
+
+        $response = new stdclass();
+        $response->message = "OK";
+        $criteria = new Criteria("workflow");
+
+        $criteria->addSelectColumn(DashletInstancePeer::DAS_INS_ADDITIONAL_PROPERTIES);
+        $rsCriteria = DashletInstancePeer::doSelectRS($criteria);
+        $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+
+        while ($rsCriteria->next()) {
+            $row = $rsCriteria->getRow();
+            $arrayField = unserialize($row["DAS_INS_ADDITIONAL_PROPERTIES"]);
+
+            if (isset($arrayField["DAS_INS_TITLE"]) && $arrayField["DAS_INS_TITLE"] != "") {
+                if ($data->DAS_INS_TITLE == $arrayField["DAS_INS_TITLE"]) {
+                    $response->message = "ERROR";
+                }
+            }
+        }
+
+        return $response;
+    }
+
     // Functions for the dasboards administration module - End
 }
diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php
index c1cfdb771..35610322e 100755
--- a/workflow/engine/controllers/installer.php
+++ b/workflow/engine/controllers/installer.php
@@ -122,6 +122,7 @@ class Installer extends Controller
         $info->multibyte = new stdclass();
         $info->soap = new stdclass();
         $info->ldap = new stdclass();
+        $info->mcrypt = new stdclass(); 
         $info->memory = new stdclass();
 
         $info->php->version = phpversion();
@@ -196,6 +197,10 @@ class Installer extends Controller
             $info->soap->version = G::LoadTranslation('ID_ENABLED');
         }
 
+        //mcrypt  info
+        $info->mcrypt->result = extension_loaded("mcrypt");
+        $info->mcrypt->version = ($info->mcrypt->result)? G::LoadTranslation("ID_ENABLED") : G::LoadTranslation("ID_NOT_ENABLED");
+
         // ldap info
         $info->ldap->result = false;
         $info->ldap->version = G::LoadTranslation('ID_NOT_ENABLED');
@@ -887,7 +892,11 @@ class Installer extends Controller
             );
 
             // inserting the outh_client
-            $query = sprintf( "USE %s;", $wf );
+            if (!$userLogged) {
+                $query = sprintf( "USE %s;", $wf );
+            } else {
+                $query = sprintf( "USE %s;", trim( $_REQUEST['wfDatabase']) );
+            }
             $this->mysqlQuery( $query );
             $query = ( "INSERT INTO OAUTH_CLIENTS (CLIENT_ID,CLIENT_SECRET,CLIENT_NAME,CLIENT_DESCRIPTION,CLIENT_WEBSITE,REDIRECT_URI,USR_UID ) VALUES
                 ('x-pm-local-client','179ad45c6ce2cb97cf1029e212046e81','PM Web Designer','ProcessMaker Web Designer App','www.processmaker.com','" . $endpoint . "','00000000000000000000000000000001' )");
diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php
index 2641d8334..e862fca5c 100755
--- a/workflow/engine/controllers/pmTablesProxy.php
+++ b/workflow/engine/controllers/pmTablesProxy.php
@@ -42,7 +42,7 @@ class pmTablesProxy extends HttpProxyController
         if ($pro_uid !== null) {
             $process = $pro_uid == '' ? array ('not_equal' => $pro_uid
             ) : array ('equal' => $pro_uid);
-            $addTables = AdditionalTables::getAll( $start, $limit, $filter, $process );
+            $addTables = AdditionalTables::getAll( false, false, $filter, $process );
 
             $c = $processMap->getReportTablesCriteria( $pro_uid );
             $oDataset = RoutePeer::doSelectRS( $c );
@@ -51,21 +51,20 @@ class pmTablesProxy extends HttpProxyController
             while ($oDataset->next()) {
                 $reportTablesOldList[] = $oDataset->getRow();
             }
-            $addTables['count'] += count( $reportTablesOldList );
-
-        	if(($start+$limit) > $addTables['count']){
-				foreach ($reportTablesOldList as $i => $oldRepTab) {
-					if($filter != ''){
-						$oldTableName = strtolower($oldRepTab['REP_TAB_NAME']);
-						$oldTableDesc = strtolower($oldRepTab['REP_TAB_TITLE']);
-						if((strpos($oldTableName, $filter) !== false) || (strpos($oldTableDesc, $filter) !== false)){
-							$addTables['rows'][] = array ('ADD_TAB_UID' => $oldRepTab['REP_TAB_UID'],'PRO_UID' => $oldRepTab['PRO_UID'],'DBS_UID' => ($oldRepTab['REP_TAB_CONNECTION'] == 'wf' ? 'workflow' : 'rp'),'ADD_TAB_DESCRIPTION' => $oldRepTab['REP_TAB_TITLE'],'ADD_TAB_NAME' => $oldRepTab['REP_TAB_NAME'],'ADD_TAB_TYPE' => $oldRepTab['REP_TAB_TYPE'],'TYPE' => 'CLASSIC' );
-						}
-					} else {
-						$addTables['rows'][] = array ('ADD_TAB_UID' => $oldRepTab['REP_TAB_UID'],'PRO_UID' => $oldRepTab['PRO_UID'],'DBS_UID' => ($oldRepTab['REP_TAB_CONNECTION'] == 'wf' ? 'workflow' : 'rp'),'ADD_TAB_DESCRIPTION' => $oldRepTab['REP_TAB_TITLE'],'ADD_TAB_NAME' => $oldRepTab['REP_TAB_NAME'],'ADD_TAB_TYPE' => $oldRepTab['REP_TAB_TYPE'],'TYPE' => 'CLASSIC' );
-					}
-				}
-			}
+            foreach ($reportTablesOldList as $i => $oldRepTab) {
+            	if($filter != ''){
+            		if((stripos($oldRepTab['REP_TAB_NAME'], $filter) !== false) || (stripos($oldRepTab['REP_TAB_TITLE'], $filter) !== false)){
+            			$addTables['rows'][] = array ('ADD_TAB_UID' => $oldRepTab['REP_TAB_UID'],'PRO_UID' => $oldRepTab['PRO_UID'],'DBS_UID' => ($oldRepTab['REP_TAB_CONNECTION'] == 'wf' ? 'workflow' : 'rp'),'ADD_TAB_DESCRIPTION' => $oldRepTab['REP_TAB_TITLE'],'ADD_TAB_NAME' => $oldRepTab['REP_TAB_NAME'],'ADD_TAB_TYPE' => $oldRepTab['REP_TAB_TYPE'],'TYPE' => 'CLASSIC' );
+            		}
+            	} else {
+            		$addTables['rows'][] = array ('ADD_TAB_UID' => $oldRepTab['REP_TAB_UID'],'PRO_UID' => $oldRepTab['PRO_UID'],'DBS_UID' => ($oldRepTab['REP_TAB_CONNECTION'] == 'wf' ? 'workflow' : 'rp'),'ADD_TAB_DESCRIPTION' => $oldRepTab['REP_TAB_TITLE'],'ADD_TAB_NAME' => $oldRepTab['REP_TAB_NAME'],'ADD_TAB_TYPE' => $oldRepTab['REP_TAB_TYPE'],'TYPE' => 'CLASSIC' );
+            	}
+            }
+            $addTables['count'] = count($addTables['rows']);
+            if($start != 0){
+           	    $addTables['rows'] = array_splice($addTables['rows'], $start);
+            }
+            $addTables['rows'] = array_splice($addTables['rows'], 0, $limit);
         } else {
             $addTables = AdditionalTables::getAll( $start, $limit, $filter );
         }
@@ -387,6 +386,19 @@ class pmTablesProxy extends HttpProxyController
         $count = 0;
         $result = new StdClass();
 
+        $tableCasesList = array();
+        $conf = new Configurations();
+        $confCasesListDraft = $conf->getConfiguration( 'casesList', 'draft');
+        $confCasesListPaused = $conf->getConfiguration( 'casesList', 'paused');
+        $confCasesListSent = $conf->getConfiguration( 'casesList', 'sent');
+        $confCasesListTodo = $conf->getConfiguration( 'casesList', 'todo');
+        $confCasesListUnassigned = $conf->getConfiguration( 'casesList', 'unassigned');
+        $tableCasesList['draft'] = ($confCasesListDraft != null) ? $confCasesListDraft['PMTable'] : '';
+        $tableCasesList['paused'] = ($confCasesListPaused != null) ? $confCasesListPaused['PMTable'] : '';
+        $tableCasesList['sent'] = ($confCasesListSent != null) ? $confCasesListSent['PMTable'] : '';
+        $tableCasesList['todo'] = ($confCasesListTodo != null) ? $confCasesListTodo['PMTable'] : '';
+        $tableCasesList['unassigned'] = ($confCasesListUnassigned != null) ? $confCasesListUnassigned['PMTable'] : '';
+
         foreach ($rows as $row) {
             try {
                 $at = new AdditionalTables();
@@ -401,6 +413,14 @@ class pmTablesProxy extends HttpProxyController
                     }
                 }
 
+                foreach ($tableCasesList as $action => $idTable) {
+                    if ($idTable == $row->id) {
+                        $conf = new Configurations();
+                        $resultJson = $conf->casesListDefaultFieldsAndConfig($action);
+                        $conf->saveObject($resultJson, "casesList", $action, "", "", "");
+                    }
+                }
+
                 if ($row->type == 'CLASSIC') {
                     G::LoadClass( 'reportTables' );
                     $rp = new reportTables();
diff --git a/workflow/engine/js/processmap/core/processes_Map.js b/workflow/engine/js/processmap/core/processes_Map.js
index fc5d52f21..e45be59db 100755
--- a/workflow/engine/js/processmap/core/processes_Map.js
+++ b/workflow/engine/js/processmap/core/processes_Map.js
@@ -240,7 +240,11 @@ var saveTaskData = function(oForm, iForm, iType)
     return false;
   }
 
-  //Set AJAX
+  oTaskData.TAS_TITLE_BK = oTaskData.TAS_TITLE;
+  oTaskData.TAS_TITLE = stringReplace("\\+", "__ADD__", oTaskData.TAS_TITLE);
+  oTaskData.TAS_DESCRIPTION = stringReplace("\\+", "__ADD__", oTaskData.TAS_DESCRIPTION);
+
+  //Set AJAX  
   var sParameters = "function=saveTaskData";
 
   var oRPC = new leimnud.module.rpc.xmlhttp({
@@ -249,6 +253,8 @@ var saveTaskData = function(oForm, iForm, iType)
     args: sParameters + "&oData=" + oTaskData.toJSONString()
   });
 
+  oTaskData.TAS_TITLE =   oTaskData.TAS_TITLE_BK;
+
   oRPC.callback = function (rpc) {
     var res = rpc.xmlhttp.responseText.parseJSON();
 
@@ -377,4 +383,3 @@ var ofToAssignTrigger = function(sStep, sTrigger, sType, iPosition)
     }.extend(this)
   });
 };
-
diff --git a/workflow/engine/methods/cases/casesListExtJs.php b/workflow/engine/methods/cases/casesListExtJs.php
index f6b0cd525..12de433a2 100755
--- a/workflow/engine/methods/cases/casesListExtJs.php
+++ b/workflow/engine/methods/cases/casesListExtJs.php
@@ -23,6 +23,14 @@ $conf = new Configurations();
 try {
     // the setup for search is the same as the Sent (participated)
     $confCasesList = $conf->getConfiguration( 'casesList', ($action == 'search' || $action == 'simple_search') ? 'search' : $action );
+
+    $table = null;
+    if (isset($confCasesList['PMTable'])) {
+        $aditionalTable = new AdditionalTables();
+        $table = $aditionalTable->load($confCasesList['PMTable']);
+    }
+    $confCasesList = ($table != null) ? $confCasesList : array ();
+
     $generalConfCasesList = $conf->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
 } catch (Exception $e) {
     $confCasesList = array ();
@@ -369,7 +377,7 @@ function getAdditionalFields($action, $confCasesList = array())
     $config = new Configurations();
     $arrayConfig = $config->casesListDefaultFieldsAndConfig($action);
 
-    if (is_array($confCasesList) && count($confCasesList) > 0 && count($confCasesList["second"]["data"]) > 0) {
+    if (is_array($confCasesList) && count($confCasesList) > 0 && isset($confCasesList["second"]) && count($confCasesList["second"]["data"]) > 0) {
         //For the case list builder in the enterprise plugin
         $caseColumns = array();
         $caseReaderFields = array();
diff --git a/workflow/engine/methods/cases/cases_SaveData.php b/workflow/engine/methods/cases/cases_SaveData.php
index d6eac639e..0a0a719e4 100644
--- a/workflow/engine/methods/cases/cases_SaveData.php
+++ b/workflow/engine/methods/cases/cases_SaveData.php
@@ -206,7 +206,7 @@ try {
                 die();
             }
         }
-        $idPmtable = $oForm->fields[$id]->pmconnection->pmtable != '' ? $oForm->fields[$id]->pmconnection->pmtable : $oForm->fields[$id]->owner->tree->children[0]->attributes['pmtable'];
+        $idPmtable = isset($oForm->fields[$id]->pmconnection->pmtable) && $oForm->fields[$id]->pmconnection->pmtable != '' ? $oForm->fields[$id]->pmconnection->pmtable : $oForm->fields[$id]->owner->tree->children[0]->attributes['pmtable'];
 
         if (!($oAdditionalTables->updateDataInTable($idPmtable, $newValues ))) {
             //<--This is to know if it is a new registry on the PM Table
@@ -289,13 +289,13 @@ try {
                         $oFolder = new AppFolder();
 
 						//***Validating the file allowed extensions***
-						$res = G::verifyInputDocExtension($aID['INP_DOC_TYPE_FILE'], $arrayFileName[$i], $arrayFileTmpName[$i]);
-						if($res->status == 0){
-							$message = $res->message;
-							G::SendMessageText( $message, "ERROR" );
-							$backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] );
-							G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] );
-							die();
+						$res = G::verifyInputDocExtension($aID['INP_DOC_TYPE_FILE'], $arrayFileName[$i], $arrayFileTmpName[$i]);
+						if($res->status == 0){
+							$message = $res->message;
+							G::SendMessageText( $message, "ERROR" );
+							$backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] );
+							G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] );
+							die();
 						}
 
                         //--- Validate Filesize of $_FILE
diff --git a/workflow/engine/methods/cases/proxyPMTablesFieldList.php b/workflow/engine/methods/cases/proxyPMTablesFieldList.php
index 37f6d6bdf..8c9634782 100644
--- a/workflow/engine/methods/cases/proxyPMTablesFieldList.php
+++ b/workflow/engine/methods/cases/proxyPMTablesFieldList.php
@@ -675,7 +675,7 @@ try {
 
     switch ($xaction) {
         case "FIELD_SET":
-            if (isset($confCasesList['second']['data'])) {
+            if (is_array($confCasesList) && isset($confCasesList['second']['data'])) {
                 foreach ($confCasesList['second']['data'] as $key => $value) {
                     $confCasesList['second']['data'][$key]['align_label'] = $confCasesList['second']['data'][$key]['align'];
                 }
diff --git a/workflow/engine/methods/setup/systemInfo.php b/workflow/engine/methods/setup/systemInfo.php
index 5142a2726..38657d8fa 100644
--- a/workflow/engine/methods/setup/systemInfo.php
+++ b/workflow/engine/methods/setup/systemInfo.php
@@ -42,6 +42,7 @@ switch ($option) {
         $oHeadPublisher->assign("SYSINFO_GD", "\"" . $systemInfo->gd->version . "\", " . (($systemInfo->gd->result)? 1 : 0));
         $oHeadPublisher->assign("SYSINFO_MULTIBYTESTRING", "\"" . $systemInfo->multibyte->version . "\", " . (($systemInfo->multibyte->result)? 1 : 0));
         $oHeadPublisher->assign("SYSINFO_SOAP", "\"" . $systemInfo->soap->version . "\", " . (($systemInfo->soap->result)? 1 : 0));
+        $oHeadPublisher->assign("SYSINFO_MCRYPT", "\"" . $systemInfo->mcrypt->version . "\", " . (($systemInfo->mcrypt->result)? 1 : 0));
         $oHeadPublisher->assign("SYSINFO_LDAP", "\"" . $systemInfo->ldap->version . "\", " . (($systemInfo->ldap->result)? 1 : 0));
         $oHeadPublisher->assign("SYSINFO_MEMORYLIMIT", "\"" . $systemInfo->memory->version . "\", " . (($systemInfo->memory->result)? 1 : 0));
 
diff --git a/workflow/engine/methods/tasks/tasks_Ajax.php b/workflow/engine/methods/tasks/tasks_Ajax.php
index 7399c8b44..d4aa963dc 100755
--- a/workflow/engine/methods/tasks/tasks_Ajax.php
+++ b/workflow/engine/methods/tasks/tasks_Ajax.php
@@ -15,10 +15,13 @@ try {
             break;
     }
 
-    //$oJSON = new Services_JSON();
+    //$oJSON = new Services_JSON();  
     $aData = get_object_vars( G::json_decode( $_POST['oData'] ));
     //$aData = get_object_vars( $oJSON->decode( $_POST['oData'] ) );
 
+    $aData["TAS_TITLE"] = str_replace("__ADD__", "+", $aData["TAS_TITLE"]);
+    $aData["TAS_DESCRIPTION"] = str_replace("__ADD__", "+", $aData["TAS_DESCRIPTION"]);
+
     if (isset( $_POST['function'] )) {
         $sAction = $_POST['function'];
     } else {
diff --git a/workflow/engine/templates/cases/casesListSetup.js b/workflow/engine/templates/cases/casesListSetup.js
index b9f2b8631..0c322203a 100644
--- a/workflow/engine/templates/cases/casesListSetup.js
+++ b/workflow/engine/templates/cases/casesListSetup.js
@@ -27,6 +27,12 @@ Ext.onReady(function () {
             case "FIELD_SAVE":
 
                 var rs = firstGrid.store.data.items;
+                if (pmTablesDropdown.getValue() == '') {
+                    if (rs.length != 0) {
+                        Ext.Msg.alert(_("ID_INFO"), _("ID_EMPTY_PMTABLE"));
+                        return;
+                    }
+                }
                 var fv = [];
 
                 for (i = 0; i <= rs.length - 1; i++) {
diff --git a/workflow/engine/templates/dashboard/dashletInstanceForm.js b/workflow/engine/templates/dashboard/dashletInstanceForm.js
index 923bdb63c..90085ac6c 100644
--- a/workflow/engine/templates/dashboard/dashletInstanceForm.js
+++ b/workflow/engine/templates/dashboard/dashletInstanceForm.js
@@ -209,29 +209,45 @@ Ext.onReady(function() {
        text:    _('ID_SAVE'),
        handler: function () {
          if (dashletInstanceFrm.getForm().isValid()) {
-           var myMask = new Ext.LoadMask(Ext.getBody(), {msg: _('ID_SAVING_LABEL') + '.' + _('ID_PLEASE_WAIT') });
-           myMask.show();
-           Ext.Ajax.request({
-             url:      'saveDashletInstance',
-             method:   'POST',
-             params:   dashletInstanceFrm.getForm().getFieldValues(),
-             success:  function (result, request) {
-                         myMask.hide();
-                         var dataResponse = Ext.util.JSON.decode(result.responseText)
-                         switch (dataResponse.status) {
-                           case 'OK':
-                             window.location.href = 'dashletsList';
-                           break;
-                           default:
-                             Ext.MessageBox.alert( _('ID_ALERT'), _('ID_FAILED_DASHBOARD INSTANCE') );
-                           break;
-                        }
-                      },
-             failure: function (result, request) {
-                        myMask.hide();
-                        Ext.MessageBox.alert( _('ID_ALERT'), _('ID_AJAX_COMMUNICATION_FAILED') );
-                      }
-           });
+            Ext.Ajax.request({
+                url: "verifyTitleDashlet",
+                method: "POST",
+                params: dashletInstanceFrm.getForm().getFieldValues(),
+                success: function (response, opts) {
+                    var dataResponse = Ext.util.JSON.decode(response.responseText);
+
+                    if (dataResponse.message == "OK") {
+                        var myMask = new Ext.LoadMask(Ext.getBody(), {msg: _('ID_SAVING_LABEL') + '.' + _('ID_PLEASE_WAIT') });
+                        myMask.show();
+                        Ext.Ajax.request({
+                          url:      'saveDashletInstance',
+                          method:   'POST',
+                          params:   dashletInstanceFrm.getForm().getFieldValues(),
+                          success:  function (result, request) {
+                                      myMask.hide();
+                                      var dataResponse = Ext.util.JSON.decode(result.responseText);
+                                      switch (dataResponse.status) {
+                                        case 'OK':
+                                          window.location.href = 'dashletsList';
+                                        break;
+                                        default:
+                                          Ext.MessageBox.alert( _('ID_ALERT'), _('ID_FAILED_DASHBOARD INSTANCE') );
+                                        break;
+                                     }
+                                   },
+                          failure: function (result, request) {
+                                     myMask.hide();
+                                     Ext.MessageBox.alert( _('ID_ALERT'), _('ID_AJAX_COMMUNICATION_FAILED') );
+                                   }
+                        });
+                    } else {
+                        Ext.MessageBox.alert(_("ID_ERROR"), _("ID_NAME_EXISTS"));
+                    }
+                },
+                failure: function (response, opts) {
+                    //
+                }
+            });
          }
          else {
            Ext.MessageBox.alert(_('ID_INVALID_DATA'), _('ID_CHECK_FIELDS_MARK_RED'));
diff --git a/workflow/engine/templates/installer/installer_cards.js b/workflow/engine/templates/installer/installer_cards.js
index da1a76130..e8f6e93bb 100644
--- a/workflow/engine/templates/installer/installer_cards.js
+++ b/workflow/engine/templates/installer/installer_cards.js
@@ -56,6 +56,7 @@ Ext.onReady(function(){
         Ext.getCmp('gd').setValue        (getFieldOutput(response.gd.version,       response.gd.result));
         Ext.getCmp('multibyte').setValue (getFieldOutput(response.multibyte.version,response.multibyte.result));
         Ext.getCmp('soap').setValue      (getFieldOutput(response.soap.version,     response.soap.result));
+        Ext.getCmp("mcrypt").setValue    (getFieldOutput(response.mcrypt.version,   response.mcrypt.result));
         Ext.getCmp('ldap').setValue      (getFieldOutput(response.ldap.version,     response.ldap.result));
         Ext.getCmp('memory').setValue    (getFieldOutput(response.memory.version,   response.memory.result));
 
@@ -204,7 +205,7 @@ Ext.onReady(function(){
         var noExistsMsg = '<span style="color: green;">' + _('ID_NO_EXIST') + '</span>';
         var response = Ext.util.JSON.decode(response.responseText);
         Ext.get('wfDatabaseSpan').dom.innerHTML = (response.wfDatabaseExists ? existMsg : noExistsMsg);
-        
+
         var dbFlag = ((!response.wfDatabaseExists) || Ext.getCmp('deleteDB').getValue());
         wizard.onClientValidation(4, dbFlag);
 
@@ -308,6 +309,11 @@ Ext.onReady(function(){
                 fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_SOAP'),
                 id  : 'soap'
               },
+              {
+                   xtype: "displayfield",
+                   id: "mcrypt",
+                   fieldLabel: _("ID_MCRYPT_SUPPORT")
+              },
               {
                 xtype     : 'displayfield',
                 fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_LDAP'),
diff --git a/workflow/engine/templates/pmTables/edit.js b/workflow/engine/templates/pmTables/edit.js
index c4453ba1a..ce00cce91 100644
--- a/workflow/engine/templates/pmTables/edit.js
+++ b/workflow/engine/templates/pmTables/edit.js
@@ -1008,7 +1008,7 @@ function editorFieldsEnableDisable(fieldTypeValue, fieldNull, fieldPrimaryKey, f
     var swI = 1;
 
     //Date
-    if (fieldTypeValue == "DATE" || fieldTypeValue == "DATETIME" || fieldTypeValue == "TIME") {
+    if (fieldTypeValue == "DATE" || fieldTypeValue == "DATETIME" || fieldTypeValue == "TIMESTAMP" || fieldTypeValue == "TIME") {
         swSize = 0; //Disable
         swPK = 0;
         swAI = 0;
diff --git a/workflow/engine/templates/pmTables/list.js b/workflow/engine/templates/pmTables/list.js
index 9a46f9329..8cf02f4d4 100755
--- a/workflow/engine/templates/pmTables/list.js
+++ b/workflow/engine/templates/pmTables/list.js
@@ -40,33 +40,43 @@ Ext.onReady(function(){
 
     pageSize = parseInt(CONFIG.pageSize);
 
-    var newMenuOptions = new Array();
     if (PRO_UID == false) {
+      var newMenuOptions = new Array();
+
       newMenuOptions.push({
-        text: _('ID_NEW_PMTABLE'),
-        handler: newPMTable
+         text: _('ID_NEW_PMTABLE'),
+         handler: newPMTable
       });
+      newMenuOptions.push({
+        text: _('ID_NEW_REPORT_TABLE'),
+        handler: NewReportTable
+      });
+
+      newButton = new Ext.Action({
+  	    id: 'newButton',
+  	    text: _('ID_NEW'),
+  	    icon: '/images/add-table.png',
+  	    menu: newMenuOptions
+  	  });
     }
+
     var flagProcessmap =  (typeof('flagProcessmap') != 'undefined') ? flagProcessmap : 0;
 
-    newMenuOptions.push({
-      text: _('ID_NEW_REPORT_TABLE'),
-      handler: NewReportTable
-    });
-
-    if (PRO_UID !== false) {
+    /*if (PRO_UID !== false) {
       newMenuOptions.push({
         text: _('ID_NEW_REPORT_TABLE_OLD'),
         handler: NewReportTableOld
       });
-    }
+    }*/
 
-    newButton = new Ext.Action({
-      id: 'newButton',
-      text: _('ID_NEW'),
-      icon: '/images/add-table.png',
-      menu: newMenuOptions
-    });
+    if (PRO_UID !== false) {
+	  newButton = new Ext.Action({
+	    id: 'newButton',
+	    text: _('ID_NEW'),
+	    icon: '/images/add-table.png',
+	    handler: NewReportTable
+	  });
+    }
 
     editButton = new Ext.Action({
       id: 'editButton',
@@ -705,12 +715,14 @@ UpdatePageConfig = function(pageSize){
 
 //Do Search Function
 DoSearch = function(){
-   infoGrid.store.load({params: {textFilter: searchText.getValue()}});
+   infoGrid.store.setBaseParam('textFilter', searchText.getValue());
+   infoGrid.store.load();
 };
 
 //Load Grid By Default
 GridByDefault = function(){
   searchText.reset();
+  infoGrid.store.setBaseParam('textFilter', searchText.getValue());
   infoGrid.store.load();
 };
 
diff --git a/workflow/engine/templates/processCategory/processCategoryList.js b/workflow/engine/templates/processCategory/processCategoryList.js
index 95c020e32..4849fba0f 100755
--- a/workflow/engine/templates/processCategory/processCategoryList.js
+++ b/workflow/engine/templates/processCategory/processCategoryList.js
@@ -124,7 +124,7 @@ Ext.onReady(function(){
     url: 'processCategory_Ajax?action=saveNewCategory',
     frame: true,
     items:[
-           {xtype: 'textfield', fieldLabel: _('ID_CATEGORY_NAME'), name: 'category', width: 250, allowBlank: false}
+           {xtype: 'textfield', fieldLabel: _('ID_CATEGORY_NAME'), name: 'category', width: 250, maxLength :100, allowBlank: false}
            ],
            buttons: [
                      {text: _('ID_SAVE'), handler: SaveNewCategory},
@@ -138,7 +138,7 @@ Ext.onReady(function(){
     frame: true,
     items:[
            {xtype: 'textfield', name: 'cat_uid', hidden: true },
-           {xtype: 'textfield', fieldLabel: _('ID_CATEGORY_NAME'), name: 'category', width: 250, allowBlank: false}
+           {xtype: 'textfield', fieldLabel: _('ID_CATEGORY_NAME'), name: 'category', width: 250, maxLength :100, allowBlank: false}
            ],
            buttons: [
                      {text: _('ID_SAVE'), handler: UpdateCategory},
diff --git a/workflow/engine/templates/setup/systemInfo.js b/workflow/engine/templates/setup/systemInfo.js
index fc7bf796c..5d666ee10 100644
--- a/workflow/engine/templates/setup/systemInfo.js
+++ b/workflow/engine/templates/setup/systemInfo.js
@@ -144,6 +144,12 @@ systemInfo.application = {
                     fieldLabel: _("ID_PROCESSMAKER_REQUIREMENTS_SOAP"),
                     value: eval("fieldFormatValue(" + SYSINFO_SOAP + ");")
                 },
+                {
+                    xtype: "displayfield",
+                    id: "mcrypt ",
+                    fieldLabel: _("ID_MCRYPT_SUPPORT"),
+                    value: eval("fieldFormatValue(" + SYSINFO_MCRYPT + ");")
+                },
                 {
                     xtype: "displayfield",
                     id: "ldap",