se agrega ventana al boton de la grilla en forma de pop up
Merge branch 'master' of https://github.com/jlallana/erps

Conflicts:
	ERPS/Web/.architect