Revision completa.
Merge branch 'master' of https://github.com/RubenSerradas/Guava

Conflicts:
	GuavaParser.yy