(Bug 4677) Initial enabling of wizard item for TR-based layouts
(Bug 4677) Updated non-TR styles to use font_sources, and expanded the property description in core2)
(Bug 4734) Increase font property length limits to allow use of more fallbacks and/or fonts with longer names
(Bug 4732) Ten new themes by momijizukamori for Librarian's Dream, with previews
(Bug 647) Better CSS styling for comment titles in Lynx and for the qrform.
Time now defaults to printing in 24-hour time. Restriction symbols moved to
be inline with the entry title.
(Bug 4689) QR box now appears properly on S2 comment pages
(Bug 4738) Don't always include the jquery-ui theme stylesheet

We include a dark-on-light theme stylesheet so that our icon browser will
have styling within layouts. However, we don't need it when we're in
site skin, because the site skin already includes the theme files (and
in that case, we'd be potentially overriding with the wrong colors)
(Bug 647) Fixed nesting issue in Firefox, and pages with pictures turned off now display alt-text reasonably.
(Bug 2174) Reading filter options: public/order

I went in to do Bug4501 and found that Mark's excellent set up already
had this support in the backend, where it counted.  Public filters
and sortorder were already supported and just needed to be added
to the UI.  I know we want to overhaul this UI eventually, but in
the meantime, users will be able to set these filters as public
and order them how they wish.  This additionally satisfies
Bug4501--in the interface, the filters in the drop down are
sorted by sortorder first, and then name. Someone who hasn't set
any sortorder for any filters will see them ordered by name.
Merge branch 'foxfirefey-Bug2174/publicorderfilters' into develop

* foxfirefey-Bug2174/publicorderfilters:
  (Bug 2174) Reading filter options: public/order
Bug #3837 - Separate out the different account types on the stats page
http://bugs.dwscoalition.org/show_bug.cgi?id=3837
Separates out different account types on the stats page.
Merge branch 'hotlevel4-bug3837/accountsOnStatsPage' into develop

* hotlevel4-bug3837/accountsOnStatsPage:
  Bug #3837 - Separate out the different account types on the stats page http://bugs.dwscoalition.org/show_bug.cgi?id=3837 Separates out different account types on the stats page.
(bug 4720) Changes error message when a search tab has been open too long.

If you leave a search tab open for more than 24 hours, check_form_auth
fails. This changes the error message to be a little clearer and tell
the user how they can get it to work again.
Merge branch 'rahaeli-bug4720' into develop

* rahaeli-bug4720:
  (bug 4720) Changes error message when a search tab has been open too long.
Merge pull request #142 from momijizukamori/Bug4677/font_sources

Bug4677/font sources
Merge pull request #143 from momijizukamori/Bug4734/FontLimit

(Bug 4734) Increase font property length limits to allow use of more fal...
(Bug 4732) Minor prop reordering in themes
Merge branch 'momijizukamori-Bug4732/LibrariansDreamThemes' into develop

* momijizukamori-Bug4732/LibrariansDreamThemes:
  (Bug 4732) Minor prop reordering in themes
  (Bug 4732) Ten new themes by momijizukamori for Librarian's Dream, with previews

Conflicts:
	bin/upgrading/s2layers/librariansdream/themes.s2
Merge pull request #151 from momijizukamori/Bug4689/BottomQR

(Bug 4689) QR box now appears properly on S2 comment pages
Merge pull request #150 from momijizukamori/Bug647/NukeTalkread

(Bug 647) Better CSS styling for comment titles in Lynx and for the qrfo...