Disambiguation class completed.
Merge.
Merge remote-tracking branch 'origin/master'

Conflicts:
	org.dragoneronca.io/src/org/dragoneronca/io/TextFileIterator.java
	org.dragoneronca.io/src/org/dragoneronca/io/TextFileUtils.java
	org.dragoneronca.nlp.wol/src/org/dragoneronca/nlp/wol/domain/entities/Edge.java
	org.dragoneronca.nlp.wol/src/org/dragoneronca/nlp/wol/domain/entities/SenseEdge.java
	org.dragoneronca.nlp.wol/src/org/dragoneronca/nlp/wol/graphBuilder/WolGraphBuilder.java
	org.dragoneronca.nlp.wol/src/org/dragoneronca/nlp/wol/parser/WolParserHandler.java
	org.dragoneronca.util/src/org/dragoneronca/util/CollectionUtils.java
Merge.
WolGraphBuilder recoded, now it is coherent with the "theory".