(Bug 3081) pic# icon keywords can now be renamed
(Bug3081) Removed some debugging lines.
(Bug 3081) Fixing of case were a default keyword is changed, but not renamed.
(Bug3081) Bringing into line with coding standards.
(Bug 3081) Previous commit had an edge case where if someone had blanked a keyword
and then restored it, the old keyword would be lost.  This is fixed.
http://bugs.dwscoalition.org/show_bug.cgi?id=4927

Added a More Options button to the comment preview page which uses jQuery to redirect to
mode=reply or reply=to.
http://bugs.dwscoalition.org/show_bug.cgi?id=4402
Stripped out all site messages code, including dropping the table from the database.

Conflicts:
	bin/upgrading/deadphrases.dat
(Bug 5079) convert default email post security to usemask when needed

If user's default email post security was set to anything other than
public or private, and they posted by email with no security header,
DW would fail to convert it to usemask when storing attached images.
This patch runs the default setting through the same conversion as
the security header.
http://bugs.dwscoalition.org/show_bug.cgi?id=5023

Altered text on the Manage Tags page for clarity.
Merged from remote branch.
Conflicts:
	htdocs/manage/tags.bml.text
(Bug 5082) Do not add multiple copies of POST arguments
(Bug 5059) Keep sidebar from overflowing width
(Bug 1716) Refactor synmerge logic into own function
(Bug 1716) Duplicate feed/feed merging backend
Merge pull request #408 from anall/feature/bug5082

(Bug 5082) Do not add multiple copies of POST arguments
Bug 2114: apply patch from LiveJournal r15922

This is LJ's patch for fixing the previous/next issue.  It looks
like the relevant code has not changed on our end, so I applied it
directly, only tweaking whitespace to match our style guidelines.

THIS IS NOT TESTED.  Please test before committing!
Merge pull request #407 from alierak/bug5079-emailpost-friends

(Bug 5079) convert default email post security to usemask when needed
Bug 2114: remove unused variable $cmp2

I noticed that the previous changes cause this $cmp2 variable to be
assigned but not used, so I removed the declaration and assignments.

(Still not tested!)
(Bug 4756) 19 themes for Planet Caravan by rising
(Bug 4613) 22 themes for Abstractia by nornoriel
Merge pull request #405 from lucymclaughlin/4402-strip-site-messages

4402 strip site messages