Checking if the list is null.
Starting the Dictionary class.
Fixing some errors in DictionaryWord, extending the Dictionary, adding a simple test class.
Small workaround on RepairMap and extending the test of extras.
Resolving conflicts.
Merge with upstream.
Relocating code from Dictionary to the new Matcher.
Extending lexicon with the dictionary data.
Merge branch 'master' of github.com:AgreementMakerLight/AML-Project into Wiktionary
Creating methods for matching based on WordNetMatcher and ParametricStringMatcher. They still need to be improved.
Fixing Dictionary (Null Pointer Exception when no translation is found).
Merge branch 'Wiktionary' of bitbucket.org:ricardofg/amlextras into Wiktionary

Conflicts:
	AgreementMakerLight/src/aml/filter/RepairMap.java
Merge branch 'master' of github.com:AgreementMakerLight/AML-Project into Wiktionary
Merge branch 'master' of github.com:AgreementMakerLight/AML-Project into Wiktionary
Fixing copyright notices and README.
Merge branch 'Wiktionary' of github.com:rfguimaraes/Extras4AML into Wiktionary
Adding some test files obtained from http://oaei.ontologymatching.org/tests/
Merge branch 'Wiktionary' of github.com:rfguimaraes/Extras4AML into Wiktionary
Inserting the Extras4AML in the default run modes, by editing AML.java. Dictionary updated.
Merge branch 'Wiktionary' of github.com:rfguimaraes/Extras4AML into Wiktionary