Merge pull request #467 from gilnoh/master

Minor update for P1EDA
Merge pull request #468 from gilnoh/master

added two fast-and-reliable P1EDA instances for WP6
added common config support for P1EDA template. added one fast configuration of P1EDA German for WP6