Getting changes and merging
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Implement phase 1 of the LexicalAligner - search the lexical resources for rules t->h of each phrase t in the text and phrase h in the hypothesis.
Implement phase 1 of the LexicalAligner - search the lexical resources for rules t->h of each phrase t in the text and phrase h in the hypothesis.
Merge remote-tracking branch 'upstream/master'
Add support to Redis Lin-Proximity and Lin-Dependency.
Add support to Redis Lin-Proximity and Lin-Dependency.
Fix exception - LexicalResourceException: info is null
Workaround for WN - Add only rules with exact lemma match for both right and left lemmas +

Limit phrase maximum length +
Fix exception - LexicalResourceException: info is null
Add VerbOcean + Add support to lexical resources that receive lemmas for right and left sides.
Add Redis Geo + CatVar
Add Wiki + prepare Maven unit tests + Load resources using reflection
added method selectLinksWith(Jcas, type.class) in LinkUtils
Checked all the resources on Linux, and changed:

- Expand environment variables
- Fix bugs in tests
- Added needed resources files
- Support for lemma resources in configuration
Checked all the resources on Linux, and changed:

- Expand environment variables
- Fix bugs in tests
- Added needed resources files
- Support for lemma resources in configuration
Add log messages + delete unneeded files from the resources
Merge remote-tracking branch 'upstream/master'
Merge pull request #427 from adlerm/master

Modification of redis-based wiki conf file,with some documentation
Set the aligner version and the relation type (link info) by the resource.