Merge de data.sql
Merge branch 'master' of https://github.com/No6things/ATICOMPANY

Conflicts:
	doc/modelo-datos/scripts/data.sql