#2332475 Add user field for ToS agreement
#2332475 Use a warning message for existing users
#2333517 Change cancel button to a link.
Rebase cleanup
Added field_interests to user accounts
Added field_interests to user accounts
Migrate interests field.
Resolved conflict
Issue #2332475: Merge branch '7.x-3.x' into 2332475-tos

Conflicts:
	drupalorg/drupalorg.module
	features/drupalorg_user/drupalorg_user.features.field_instance.inc
Issue #2332475 Update URL.
Merge branch 'migrate-languages-spoken' into 7.x-3.x

Conflicts:
	drupalorg/drupalorg.install
	features/drupalorg_user/drupalorg_user.field_group.inc
Issue #2367255: Remove misspelled country.
Merge cleanup.
Issue #2281763 Add personal & professional profile fieldsets.
#2322267 Clean up interests migration.
Issue #2322267 Do not link interests to standard taxonomy page, which is empty.
Features re-export.
Issue #2332475: Merge branch '2332475-tos' into 7.x-3.x

Conflicts:
	features/drupalorg_user/drupalorg_user.features.field_instance.inc
Issue #2322273: Merge branch '7.x-3.x' into 2322273-migrate-drupal-contributions

Conflicts:
	drupalorg/drupalorg.install
	features/drupalorg_user/drupalorg_user.features.field_instance.inc
	features/drupalorg_user/drupalorg_user.field_group.inc