Cambios antes del merge.
Merge branch 'master' of https://github.com/RubenSerradas/Guava

Conflicts:
	GuavaTree.cc
Arreglado problema con la expresion id.