Use LJ::Error and display an actual error message

(instead of splatting across the top of the screen)
Merge pull request #925 from afuna/userpic-display-error-message

Use LJ::Error and display an actual error message
Merge branch 'release-1.22' into develop

* release-1.22:
  Use LJ::Error and display an actual error message

Conflicts:
	cgi-bin/LJ/Userpic.pm