cambios en la estructura de la bd
Merge branch 'master' of https://github.com/simgia/ecopyahu

Conflicts:
	fuentes/server/index.php