Merge origin/master into tomas

Conflicts:
	Biblioteca/src/biblioteca/Livro.java