Merge branch 'master' of github.com:loomio/loomio into feature/edit-proposal-notifies-users-who-have-voted

* 'master' of github.com:loomio/loomio:
  Improve group requests admin page
  Fix problems with GroupRequest states
  Add email host to staging environment
  Add approved_but_not_setup scope to admin group_requests

Conflicts:
	db/schema.rb