Clientes Tienda Finalizado
Merge origin/master

Conflicts:
	LaAnita/nbproject/private/private.xml
Merge origin/master

Conflicts:
	LaAnita/nbproject/private/private.xml