BUG 12659 Adicion de etiquetas hardcodeada SOLVED

Se agrego una etiqueta nueva
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
BUG 12679 Error al crear template con nombre etiqueta SOLVED

Se agrego un filtro para crear con etiqueta existente
Arreglo para actualizacion de lenguaje de plugins enterprise
Merge branch 'master' of git://github.com/colosa/processmaker
Arreglod de sentencia if
Merge pull request #1995 from brayanpereyra/master

Arreglo de sentencia if
Merge remote branch 'upstream/master' into BUG-12738
BUG 12738 SQL doesn't work in GRID - Text-Area fields SOLVED

- When trying to establish a field dependency in grid between a Text field and a Text-area field using an external SQL connection, text-area field remains empty.
- Adding query option in the xmlform on a textarea of a grid(validate).