(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=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.
(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
Merge pull request #407 from alierak/bug5079-emailpost-friends

(Bug 5079) convert default email post security to usemask when needed
Merge pull request #405 from lucymclaughlin/4402-strip-site-messages

4402 strip site messages
Merge pull request #409 from momijizukamori/Bug5059/LeftyOverlap

(Bug 5059) Keep sidebar from overflowing width
(Bug 4839) Fix border on header when no page bg is set
(Bug 3081) Fixing the SQL from the last commit.
(Bug 4839) Fix border on footer when no page bg is set
Merge pull request #402 from annariel/Bug3081

Bug3081 Allow renaming pic#xxx keywords
(Bug 3376) Add search for support requests

This extends full text Sphinx search to our support system, with respect
for the viewer's privileges.

This requires an update to your sphinx configuration to configure the
new 'dwsupport' index. You will also need to set up a cron job that
runs:

    bin/ljmaint.pl copy_supportlog

After that runs, you need to reindex and rotate the index with Sphinx:

    indexer --rotate dwsupport

That's all.