Merge remote-tracking branch 'origin/master'

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

Conflicts:
	6.- Resource/Logos(Ai)/LogosCarola/Thumbs.db
	6.- Resource/Logos(Ai)/Thumbs.db
Modulo de categoria terminado

asd