WIP

Conflicts:
	spec/controllers/groups_users_controller_spec.rb