Fix #993 The icon displayed on the user profile page does not match the package page.

Conflicts:
	Website/Controllers/UsersController.cs
Merge branches 'anurse-is-dumb', 'tilovell-993-ONLY-packageOwnerIcons', 'tilovell-1089-noRemoveLastOwner', 'tilovell-1162-duplicateEmailIssues', 'tilovell-935-noVersionNumberSearchResults', 'tilovell-1125-unfilledContactFields' and 'johtaylo-159-SearchSpecialCharacters' into dev