Merge pull request #272 from foxfirefey/Bug1867/readfiltermodule

(Bug 1867) Add reading filter module to core2
Merge pull request #297 from rahaeli/bug4897

(bug 4897) add hook for dreamwidth.org specific text
Merge branch 'ninetyd-bug4247/comm_invites_rephrase' into develop from
pull request #309

* ninetyd-bug4247/comm_invites_rephrase:
  Bug 4247 - Clarify invite notification and options on /manage/invites
 -- Rephrase link to /manage/invites in notifications
 -- Rephrase Manage Invites title in several locations
 -- Add explanatory text on /manage/invites and /community/manage
 -- Rephrase various string on /manage/invites
 -- Add text and list of links on success page
 -- Add line-breaks
 -- Downgrade subheaders to H2
 -- Change UL to DL for community lists
 -- Move dead string to deadphrases

Conflicts:
	bin/upgrading/deadphrases.dat
Bug 3903 - Add "grant access" to subscription notification
http://bugs.dwscoalition.org/show_bug.cgi?id=3903
-- Add link to grant access to 'added to circle' notification
Merge pull request #301 from ninetyd/bug4240/profile_module_text

Bug 4240 - Profile module: match text links with icon links
Merge pull request #302 from ninetyd/bug3903/circle_notif_addlink

Bug 3903 - Add "grant access" to subscription notification
Bug 4917 - Bases: bottomcomment links invisible in some themes
http://bugs.dwscoalition.org/show_bug.cgi?id=4917
-- Use entry link colors for bottomcomment links for readability
-- Reformat part of the CSS for better clarity
-- Remove repeated CSS
-- Move #primary a:hover before active
(Bug 4755) Redundant CSS clean-up, properties and layout credits applied properly
(Bug 4451) Import of theme, layout, and previews from hg
(Bug 4451) Fix for misaligned icons
Merge pull request #311 from ninetyd/bug4917/bases_bottomcomment_colors

Bug 4917 - Bases: bottomcomment links invisible in some themes
Merge pull request #286 from momijizukamori/Bug4755/PlanetCaravan

Bug 4755 - New layout Planet Caravan by daemon @ LJ. Converted by momijizukamori, with additional themes also by momijizukamori
What is this I don't know. But it's gone now bye!
(Bug 4451) Removal of hardcoded fonts and some CSS clean-up
(Bug 4451) Fixed missing bracket in CSS
Merge pull request #106 from momijizukamori/Bug4451/Lefty

(Bug 4451) Import of theme, layout, and previews from hg
Merge pull request #303 from ninetyd/bug4566/circle_notif_openid

Bug 4566 - change notification email when OpenID account grants access t...
http://bugs.dwscoalition.org/show_bug.cgi?id=4242

A few tweaks as requested by Fu:
-Removed the horizontal rule between poster name and comment subject. Added a <br /> instead.
-Removed quote marks on BML::ML only strings.
-Updated the unauthenticated_openid string to cover the whole thing.
Bug 4935 - remove OBSOLETE setting warning
http://bugs.dwscoalition.org/show_bug.cgi?id=4935
-- Remove obsolete section from manage/profile
-- Remove obsolete string and move to deadphrases
-- Hide obsolete option from customize
http://bugs.dwscoalition.org/show_bug.cgi?id=4325

Icons are now uploadable from https sites as well as http sites.