added conditionals to plenaries controller
Merge branch 'master' of github.com:gonecase/colloquy_new