modelo
Merge branch 'master' of https://github.com/GrupoHardtech/BMS

Conflicts:
	mysql/bms.mwb