Add Models
Merge branch 'master' of https://github.com/uniritter/liquid-democracy

Conflicts: