several changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	biblio.bib
	comandos.tex
	glossary.bib