Move discussion feature added
update gemfile
Merge pull request #622 from loomio/refactor/gemfile_version_dependency

update gemfile
Refactor email preferences
Merge pull request #629 from loomio/craigambrose-refactor_email_preferences

Refactor email preferences
Add missing usernames

Group admins were not getting their usernames generated when they first
join Loomio. This code solves that problem for the future and fixes all
the users who have missing usernames to date.
Merge pull request #630 from loomio/bug/fixing-mentions

Add missing usernames - Issue #582
remove some complexity from discussions controller
Merge pull request #619 from loomio/refactor/discussion-controller

Remove some complexity from discussions controller
refactored code from discussion model
Merge branch 'master' of github.com:loomio/loomio into feature/move-discussion

* 'master' of github.com:loomio/loomio:
  remove some complexity from discussions controller
  Add missing usernames
  Refactor email preferences
  update gemfile
  add unless clause to group.average on admin page
conflicts
more conflicts
final commit