removed some code duplication
Merge branch 'master' of github.com:Prechtig/E-Voting