added common config support for P1EDA template. added one fast configuration of P1EDA German for WP6
minor
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