Merge remote-tracking branch 'origin/master'

Conflicts:
	6.- Resource/Logos(Ai)/iconos/Thumbs.db
xxxx
Merge remote-tracking branch 'origin/master'

Conflicts:
	4.- Código/AnaIsRepo/nbproject/private/private.properties