Merge commit '41575d24bb' into webgui8. Some tests still failing.

Conflicts:
	docs/gotcha.txt
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/File/GalleryFile/Photo.pm
	lib/WebGUI/Asset/Post.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/WikiPage.pm
	lib/WebGUI/Asset/Wobject/WikiMaster.pm
	lib/WebGUI/Cache.pm
	lib/WebGUI/Content/Setup.pm
	lib/WebGUI/Role/Asset/Subscribable.pm
	lib/WebGUI/Shop/Cart.pm
	lib/WebGUI/Shop/Pay.pm
	lib/WebGUI/Shop/PayDriver/ITransact.pm
	sbin/testEnvironment.pl
	t/Asset/WikiPage.t
	t/Shop/PayDriver.t
	t/Shop/PayDriver/ITransact.t
	t/Shop/PayDriver/Ogone.t
	t/Shop/TaxDriver/EU.t
	t/Shop/TaxDriver/Generic.t
	t/Workflow/Activity/RemoveOldCarts.t
	t/lib/WebGUI/Test.pm

docs/changelog/7.x.x.txt

@@ -1,4 +1,23 @@
+7.9.5
+
 7.9.4
+ - We're shipping underscore.js now for its suite of extremely handy utility
+   functions.  Include it from www/extras/underscore/underscore-min.js.
+   Documentation is available at http://documentcloud.github.com/underscore/.
+ - fixed #11535: i18n - Asset_MapPoint - Tag form_fax - wrong text
+ - Implement hierarchial wiki keywords differently.
+ - fixed Redundant per item address display in cart.
+ - added a way to pass additional headers to WebGUI::Mail::Send from WebGUI::Inbox::Message API
+ - added: WebGUI::Wizard framework to build step-by-step wizards
+ - added: example / thumbnail images for templates
+ - added: Style Picker as part of the initial setup wizard
+ - added: CHI cache driver
+ - added #11498: Gallery: Automatically adjust orientation of images based on EXIF data
+ - fixed #11547: Default Inbox View Template Delete buttton failure
+ - fixed #11542: Date macro can pass in epoch values that do not pass regex checks
+ - fixed #11537: Wiki, sorting by most popular
+ - added: Rewrite of the Shop and Cart.
+ - fixed: Urls in English WebGUI sites can now support valid utf-8 characters that do not otherwise interfere with the url.
 
 7.9.3
  - added #11477: No synopsis in asset now means no synopsis in search index