actualizacion
Merge branch 'admin_beta' of https://github.com/rikimm/mvs into admin_beta

Conflicts:
	js/script.js
corrección de errores