Generate error when tryingto delete a proposal that is part of a poll. Closes #218
Merge branch 'master' into redesign