Merge branch 'master' of github.com:loomio/loomio into bug/membership-request-notification

Conflicts:
	spec/models/ability_spec.rb