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

Conflicts:
	db/schema.rb
	spec/models/ability_spec.rb