Merge branch 'master' of github.com:loomio/loomio into bug/payment-fields

Conflicts:
	extras/setup_group.rb
	features/step_definitions/start_new_group_steps.rb