Poner divisa empresa
Merge branch 'master' of github.com:arcnexus/terra
arreglado
Conflicts:
	DB/DBTERRA.mwb