Merge inicial
- Nuevo form frm_dev2
fdbozzo - 27/08/2014 21:15:25:
fdbozzo - 27/08/2014 23:43:22:
fdbozzo - 27/08/2014 23:45:15:
cherry pick desde main