FINISH ABMEMPRESA
Merge branch 'master' of https://github.com/norchow/gestiondedatos

Conflicts:
	scripts/0-DropTablesAndSchema.sql
Merge branch 'master' of https://github.com/norchow/gestiondedatos