Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
BUG-11584 Inactive Users can login into ProcessMaker.

Was added a validation to make it works fine.
Merge pull request #1724 from Jennydmz/BUG-11584

 BUG 11584 Inactive Users can login into ProcessMaker. SOLVED
BUG 11726 "Contador de triggers para asignacion no se..." SOLVED

- Contador de triggers para asignacion no se restablece a su valor original cuando se eliminan triggers.
- Problema resuelto, Assign Task, el contador de triggers muestra el valor actual, cuando se adicionan o eliminan triggers.
* Available from version ProcessMaker-2.0.47 (2.5.1)
BUG-11869 los botones de save y cancel en importacion de usuario... SOLVED

- Container stayed small because of the size of the source.
- Modified size.
Merge pull request #1726 from marcoAntonioNina/BUG-11869

BUG-11869 los botones de save y cancel en importacion de usuario... SOLVED
Merge pull request #1725 from luisfernandosl/BUG-11726

BUG 11726 "Contador de triggers para asignacion no se..." SOLVED
BUG 0000 Rad Map Perdida de sesion cuando se ejecuta casos SOLVED

- Added Login modal to continue the session for dynaforms in cases.
BUG 11865 Problema con los campos fecha SOLVED

- The dates was stored with mask
- Before save dates unmask the value
Merge pull request #1729 from julceslauhub/master

BUG 11865 Problema con los campos fecha SOLVED
Changing skin values in some pages from "classic" to "neoclassic"
Merge pull request #1730 from julceslauhub/master

Changing skin values in some pages from "classic" to "neoclassic"
Adding a smarty plugin function to support load pmos translations on smarty templates

- A new file containing the smarty plugin definition was added on gulliver/includes/smarty_plugins path
- Currently it was added to used only with mvc layout (it is implemented on Siplified UI views)
BUG 9897 uploadDoc() de Alfresco no te notifica si la ruta a un archivo es incorrecta IMPROVEMENT

- Methods descriptions are not correct
- Changing the methods descriptions for the return value, "string" to "object"
Merge pull request #1731 from julceslauhub/master

BUG 9897 uploadDoc() de Alfresco no te notifica si la ruta a un archivo es incorrecta IMPROVEMENT
Merge pull request #1732 from ralpheav/master

BUG 11718 : Campo type en la creación de un report table no está validado
Adding missing smarty plugin translate implementation
Removing dummy test string