users and discussion controller
Merge pull request #1251 from loomio/more_nil_bugs

users and discussion controller