_user_relationships_ui_between() doesn't seem to exist anymore.
Merge branch 'master' of github.com:dmuth/Dougs-Drupal-Templates

Conflicts:
	user-profile.tpl.php