Signed-off-by: certeroletal <pampablo@gmail.com>
clase usuario
Merge branch 'master' of https://github.com/lsa1982/Electrolux

Conflicts:
	Electrolux/Modulos/Core/frmGridUsuario.aspx
usuarios
Merge branch 'master' of https://github.com/lsa1982/Electrolux
Signed-off-by: certeroletal <pampablo@gmail.com>
cambio paginacion
Merge branch 'master' of https://github.com/lsa1982/Electrolux
FLujo actividad