Merge branch 'master' of github.com:loomio/loomio into feature/email-requester-when-membership-approved

Conflicts:
	db/schema.rb