Fixed to EditDistanceEDAwRedis
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Added implementation for the initialize(CommonConfig conf) and startTraining(CommonConfig conf) methods in the P1EDATemplate class (and added a few attributes for needed directories)
Merge pull request #469 from gilnoh/master

Common config support for P1EDA, and one German instance for WP6 usage.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	alignmentedas/src/main/java/eu/excitementproject/eop/alignmentedas/p1eda/P1EDATemplate.java
Update pom.xml

Updated pom to include the snapshot version of the lap.
Merge remote-tracking branch 'upstream/master'
Small edits
Merge pull request #471 from vnastase/master

Small edits in util and EditDistanceEDAwRedis
Commented treetagger dependencies
Removed treetagger dependencies from util's pom
adding Italian Maltparser model dependency on LAP