Merge branch 'master' into WebGUI8

etc/WebGUI.conf.original

@@ -194,7 +194,9 @@
 
 "shippingDrivers" : [
     "WebGUI::Shop::ShipDriver::FlatRate",
-    "WebGUI::Shop::ShipDriver::USPS"
+    "WebGUI::Shop::ShipDriver::USPS",
+    "WebGUI::Shop::ShipDriver::USPSInternational",
+    "WebGUI::Shop::ShipDriver::UPS"
     ],
 
 # Specify the list of template parsers available in the system.
@@ -815,6 +817,7 @@
     "Page"             : "Page", 
     "PageTitle"        : "PageTitle", 
     "PageUrl"          : "PageUrl", 
+    "PickLanguage"     : "PickLanguage",
     "RandomAssetProxy" : "RandomAssetProxy", 
     "RandomThread"     : "RandomThread", 
     "RootTitle"        : "RootTitle", 
@@ -970,6 +973,7 @@
     "WebGUI::Content::AssetManager",
     "WebGUI::Content::AssetDiscovery",
     "WebGUI::Content::PassiveAnalytics",
+    "WebGUI::Content::SetLanguage",
     "WebGUI::Content::AjaxI18N",
     "WebGUI::Content::Account",
     "WebGUI::Content::AssetHistory",
@@ -1069,4 +1073,10 @@
       "Opera Mini"
    ],
 
+#A list of UserAgents of recognized mobile platforms.  If useMobileStyle is set in the
+#Admin settings, then the mobile style will be used for these browsers.
+   "siteIndex" : {
+      "showHiddenPages" : 0
+   }
+
 }