Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge pull request #1722 from julceslauhub/master

Validating bug in HD supply server with preg_replace function
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 11865 Problema con los campos fecha SOLVED

- The dates was stored with mask
- Before save dates unmask the value