Merge branch 'proyecto1' into clte1

Conflicts:
	audita/sql/id1agaud510.sql