Merge branch 'master' of github.com:loomio/loomio into feature/invite-to-discussion

Conflicts:
	db/schema.rb