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
(Bug 784) Whitelist NPR Videos

Whitelists NPR videos. Fixes #784. Note audio NPR clips use a different format.
Merge pull request #946 from hotlevel4/bug784/whitelistNPR

(Bug 784) Whitelist NPR Videos
Implement Previous/Next Entry links within tag. Fixes #943

Building off of the existing code base for the generic previous/next
entry links.  The new links use the same structure, but pass in one
additional argument (the tag to search within) to go.bml. If a tag is
passed in, it narrows the SQL query in get_item_id_near2()
appropriately.
Limiting display of tag links. Update to #943

Displaying the previous/next links everywhere is a bit overkill. Added
logic to limit to only show on single-entry pages, and /tag/foo
multi-entry pages.
Merge pull request #947 from woggy/feature/2014-tagnav

Add Intra-tag navigation links - fixes #943
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
Use table prefix in theschwartz.bml. Fixes #950
Replace CRLF with LF
Merge pull request #951 from afuna/crlf-lf-cleanup

Replace CRLF with LF
Merge pull request #952 from pauamma/admin-theschwartz-table-prefix

Use table prefix in theschwartz.bml. Fixes #950
(Bug 710) Warn when icons do not have keywords

Adds a warning to the /editicons page if icons still have default keywords.
Merge pull request #956 from hotlevel4/bug710/warniconkeywords

(Bug 710) Warn when icons do not have keywords