Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/nilseckert/diningdevelopersdilema
zeitgeist
Added requested distinct-feature for CriteriaHelper
Use CriteriaHelper and TypedQuery instead of Query in VotingDao
Merge branch 'buffin-zeitgeist'