Merge branch 'ArcNexus' of https://github.com/arcnexus/RedFoX.git into Ladis
Merge branch 'master' into Ladis
CAjas
Cajas
Merge branch 'master' into Ladis
Merge branch 'master' of https://github.com/arcnexus/RedFoX.git

Conflicts:
	Maya.pro
Reformateo pantalla clientes
Merge branch 'master' of github.com:arcnexus/RedFoX
Merge branch 'ArcNexus'