Conflicts:
	app/controllers/discussions_controller.rb
	app/controllers/groups_controller.rb
	app/models/discussion.rb
	config/routes.rb
	spec/controllers/discussions_controller_spec.rb
	spec/controllers/motions_controller_spec.rb
	spec/support/request_helpers.rb