From 5ae64fc1ce62bd16e9d6fed3371909fdedc3cfba Mon Sep 17 00:00:00 2001
From: seanmcne_cp <SND\seanmcne_cp>
Date: Mon, 22 Dec 2014 21:29:45 +0000
Subject: [PATCH] 1.0.1.24 - last 2011 build

---
 mspfedyn_/OrgDbOrgSettings/Settings.xml       | 370 ++++++++-----
 .../OrgDbOrgSettings/orgDBOrgSettings.html    | 523 ++++++++++--------
 2 files changed, 532 insertions(+), 361 deletions(-)

diff --git a/mspfedyn_/OrgDbOrgSettings/Settings.xml b/mspfedyn_/OrgDbOrgSettings/Settings.xml
index 6e8d4b1..846c453 100644
--- a/mspfedyn_/OrgDbOrgSettings/Settings.xml
+++ b/mspfedyn_/OrgDbOrgSettings/Settings.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <defaultorgSettings>
   <orgSetting minSupportedVersion="5.0.9690.583"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
+              name="MaxRecordsForExportToExcel"
+              isOrganizationAttribute="true"
+              min="5000"
+              max="50000"
+              defaultValue="10000"
+              settingType="Number"
+              supportUrl="http://msdn.microsoft.com/en-us/library/gg328408.aspx"
+              urlTitle="Organization entity attributes"
+              description="Max number of records to export to Excel, the larger the number the longer the exports will take (generally)." />
+  <orgSetting minSupportedVersion="5.0.9690.583"
+              maxSupportedVersion="7.9.9999.9999"
               name="BackgroundSendBatchSize"
               min="1"
               max="255"
@@ -11,7 +22,7 @@
               urlTitle="KB 2691237"
               description="Max email batch size per user for sending emails in the background. This sets the number of emails to download in one batch for the BackgroundSend API." />
   <orgSetting minSupportedVersion="5.0.9688.583"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="AutoCreateContactOnPromote"
               min="null"
               max="null"
@@ -21,7 +32,7 @@
               urlTitle="KB 2691237"
               description="Disables the ability for the entire organization to create contact records automatically when an email is tracked in CRM. This option can also be disabled from the user settings area for each user. &lt;b&gt;False&lt;/b&gt; - Disables the auto creation of contacts. &lt;b&gt;True&lt;/b&gt; - Enables the auto creation of contacts." />
   <orgSetting minSupportedVersion="5.0.9688.583"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="ClientUEIPDisabled"
               min="null"
               max="null"
@@ -31,7 +42,7 @@
               urlTitle="KB 2691237"
               description="Disables the sending of customer experience feedback for the organization. This option can also be disabled from the user settings area for each user. &lt;b&gt;False&lt;/b&gt; - Enables the sending. &lt;b&gt;True&lt;/b&gt; - Disables the sending." />
   <orgSetting minSupportedVersion="5.0.9688.583"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="DisableInactiveRecordFilterForMailMerge"
               min="null"
               max="null"
@@ -41,7 +52,7 @@
               urlTitle="KB 2691237"
               description="When performing a mail merge inactive records are not included in the mail merge. This option allows you to override that functionality. &lt;b&gt;False&lt;/b&gt; - Inactive records will not be included in the mail merge. &lt;b&gt;True&lt;/b&gt; - Inactive records will be included in the mail merge." />
   <orgSetting minSupportedVersion="5.0.9688.583"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="DisableSmartMatching"
               min="null"
               max="null"
@@ -51,7 +62,7 @@
               urlTitle="KB 2691237"
               description="Disables the smart matching functionality and relies on the tracking token on the incoming e-mails for e-mail tracking. &lt;b&gt;False&lt;/b&gt; - Enables smart matching &lt;b&gt;True&lt;/b&gt; - Disables smart matching" />
   <orgSetting minSupportedVersion="5.0.9690.583"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="LookupNameMatchesDuringImport"
               min="null"
               max="null"
@@ -71,7 +82,7 @@
               urlTitle="KB 2691237"
               description="If you disable the &quot;Track e-mail sent between CRM users as two activities&quot; setting, e-mail messages from a CRM user to a queue are not delivered. Additionally, if a workflow rule sends an e-mail message to a queue, e-mail messages that are sent by the workflow rule are not delivered. &lt;b&gt;False&lt;/b&gt; - Internal e-mail messages to queues will not be delivered. &lt;b&gt;True&lt;/b&gt; - Internal e-mail messages to queues will be delivered." />
   <orgSetting minSupportedVersion="5.0.9690.1533"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="EnableRetrieveMultipleOptimization"
               min="0"
               max="3"
@@ -81,7 +92,7 @@
               urlTitle="White Paper"
               description="For more information see the Optimizing the Performance of Queries against Large Datasets section in the Optimizing and Maintaining the Performance of a Dynamics CRM 2011 Server Infrastructure" />
   <orgSetting minSupportedVersion="5.0.9690.1992"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="SkipSuffixOnKBArticles"
               min="null"
               max="null"
@@ -91,7 +102,7 @@
               urlTitle="KB 2691237"
               description="When you create a knowledge base (KB) article the KB article number uses the &quot;Prefix-Number-Suffix&quot; format. You expect the format to be &quot;Prefix-Number.&quot; For more info see KB: &lt;a href=&quot;http://support.microsoft.com/kb/981840&quot;&gt;981840&lt;/a&gt;" />
   <orgSetting minSupportedVersion="5.0.9690.1992"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="SkipGettingRecordCountForPaging"
               min="null"
               max="null"
@@ -101,7 +112,7 @@
               urlTitle="KB 2691237"
               description="Disables the record count query. This query is responsible for getting the total number of records returned for each view. This query can cause longer search times and may lead to SQL timeouts or Exceptions. &lt;b&gt;False&lt;/b&gt; - Enables record count on views. &lt;b&gt;True&lt;/b&gt; - Disables record count on views." />
   <orgSetting minSupportedVersion="5.0.9690.2165"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="VerboseErrorsOnPromoteToCRM"
               min="0"
               max="1"
@@ -111,7 +122,7 @@
               urlTitle="KB 2691237"
               description="Enables verbose user error messaging when tracking items from Outlook to Dynamics CRM. By default some error messages during the tracking are suppressed from being shown to the end user and this setting enables those errors to be shown. &lt;b&gt;0&lt;/b&gt; - Disables the verbose errors. &lt;b&gt;1&lt;/b&gt; - Enables the verbose errors." />
   <orgSetting minSupportedVersion="5.0.9690.2243"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="JumpBarAlphabetOverride"
               min="null"
               max="null"
@@ -121,7 +132,7 @@
               urlTitle="KB 2494984"
               description="Allows for customization of the Alphabet Bar for the CRM Application Grids for Microsoft Dynamics CRM" />
   <orgSetting minSupportedVersion="5.0.9690.2243"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="JumpBarNumberIndicatorOverride"
               min="null"
               max="null"
@@ -131,7 +142,7 @@
               urlTitle="KB 2494984"
               description="Allows for customization of the Alphabet Bar for the CRM Application Grids for Microsoft Dynamics CRM" />
   <orgSetting minSupportedVersion="5.0.9690.2243"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="OverrideV5SenderConflictResolution"
               min="null"
               max="null"
@@ -141,7 +152,7 @@
               urlTitle="KB 2691237"
               description="When multiple records with the same e-mail address exist in the Dynamics CRM Organization and e-mail is auto tracked the e-mail is resolved to the record that was created first. This option allows you to override that functionality.&lt;b&gt;False&lt;/b&gt; - E-mails are tracked to the first record created &lt;b&gt;True&lt;/b&gt; - E-mails are not tracked automatically if there are multiple records with the same e-mail address." />
   <orgSetting minSupportedVersion="5.0.9690.2720"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="OverrideTrackInCrmBehaviour"
               min="0"
               max="1"
@@ -151,7 +162,7 @@
               urlTitle="KB 2691237"
               description="When this option is Enabled the Track in CRM button will function like the Set Regarding button. 0 - Normal behavior of the Track in CRM button not having to set a Regarding record. &lt;b&gt;1&lt;/b&gt; - Track in CRM will function like the Set Regarding and make you choose a regarding record." />
   <orgSetting minSupportedVersion="5.0.9690.2720"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="ActivityConvertDlgCampaignUnchecked"
               min="null"
               max="null"
@@ -161,7 +172,7 @@
               urlTitle="KB 2691237"
               description="Controls the default value of the Record Closed Campaign Response option. When converting an activity to an opportunity this default option controls whether the source campaign is set or not. &lt;b&gt;False&lt;/b&gt; - Record Closed Campaign Response checked and source campaign will be set. &lt;b&gt;True&lt;/b&gt; - Record Closed Campaign Response not checked and source campaign is not set." />
   <orgSetting minSupportedVersion="5.0.9690.2720"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="6.1.9999.9999"
               name="EnableQuickFindOptimization"
               min="0"
               max="1"
@@ -171,7 +182,7 @@
               urlTitle="White Paper"
               description="For more information see the Optimizing the Performance of Quick Find Queries section in the Optimizing and Maintaining the Performance of a Dynamics CRM 2011 Server Infrastructure" />
   <orgSetting minSupportedVersion="5.0.9690.2720"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="IdsCountForUsingGuidStringForSecurity"
               min="0"
               max="1000"
@@ -181,7 +192,7 @@
               urlTitle="KB 2691237"
               description="Not yet documented in optimization paper."/>
   <orgSetting minSupportedVersion="5.0.9690.2720"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="IdsCountBeforeUsingJoinsForSecurity"
               min="0"
               max="2147483647"
@@ -191,7 +202,7 @@
               urlTitle="KB 2691237"
               description="Not yet documented in optimization paper." />
   <orgSetting minSupportedVersion="5.0.9690.2720"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="SharingLimitForPOASnapshotTable"
               min="1"
               max="2147483647"
@@ -201,7 +212,7 @@
               urlTitle="KB 2691237"
               description="Not yet documented in optimization paper." />
   <orgSetting minSupportedVersion="5.0.9690.2720"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="RecordCountLimitToSwitchToCteSecuritySql"
               min="1"
               max="2147483647"
@@ -211,7 +222,7 @@
               urlTitle="White Paper"
               description="For more information see the Optimizing the Performance of Queries against Large Datasets section in the Optimizing and Maintaining the Performance of a Dynamics CRM 2011 Server Infrastructure. &lt;b&gt;Warning: do not increase this value unless it's for a *very* specific reason.&lt;/b&gt; " />
   <orgSetting minSupportedVersion="5.0.9690.2720"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="RetrieveMultipleSharingCountThreshold"
               min="1"
               max="2147483647"
@@ -221,7 +232,7 @@
               urlTitle="White Paper"
               description="For more information see the Optimizing the Performance of Queries against Large Datasets section in the Optimizing and Maintaining the Performance of a Dynamics CRM 2011 Server Infrastructure" />
   <orgSetting minSupportedVersion="5.0.9690.2720"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="SendEmailSynchronously"
               min="0"
               max="1"
@@ -231,7 +242,7 @@
               urlTitle="KB 2691237"
               description="If you have a plugin registered on the e-mail send flow you will want to update this setting to 1.&lt;b&gt;0&lt;/b&gt; - E-mail is sent asynchronously &lt;b&gt;1&lt;/b&gt; - E-mail is sent synchronously" />
   <orgSetting minSupportedVersion="5.0.9690.2720"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="UsePlainTextForEmailTemplateBody"
               min=""
               max=""
@@ -241,17 +252,17 @@
               urlTitle="KB 2691237"
               description="Will set CRM to send emails with only plain text instead of HTML text." />
   <orgSetting minSupportedVersion="5.0.9690.2835"
-              maxSupportedVersion="5.0.9999.9999"
-              name="SetRegardingLookupDefaultEntityType"
-              min="null"
-              max="null"
-              defaultValue=""
-              settingType="String"
-              supportUrl="http://support.microsoft.com/kb/2691237"
-              urlTitle="KB 2691237"
-              description="Change default entity for Regarding Lookup Dialog" />
+            maxSupportedVersion="5.0.9999.9999"
+            name="SetRegardingLookupDefaultEntityType"
+            min="null"
+            max="null"
+            defaultValue=""
+            settingType="String"
+            supportUrl="http://support.microsoft.com/kb/2691237"
+            urlTitle="KB 2691237"
+            description="Change default entity for Regarding Lookup Dialog" />
   <orgSetting minSupportedVersion="5.0.9690.2835"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="IntegratedAuthenticationMethod"
               min="null" max="null"
               defaultValue=""
@@ -260,7 +271,7 @@
               urlTitle="KB 2691237"
               description="Changes the request sent to the ADFS server, this settings default value is NULL (which will not change anything). This changes the authentication when users access the org using the context https://internal.domain.com/org. Valid values are: &lt;br/&gt; an empty string (to reset to NULL use reset to default). &lt;br/&gt;&lt;b&gt;urn:federation:authentication:windows&lt;/b&gt; as a value uses - Integrated auth &lt;br/&gt;&lt;b&gt;urn:oasis:names:tc:SAML:1.0:am:password&lt;/b&gt; as a value uses -  Forms" />
   <orgSetting minSupportedVersion="5.0.9690.2835"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="IfdAuthenticationMethod"
               min="null" max="null"
               defaultValue=""
@@ -269,7 +280,7 @@
               urlTitle="KB 2691237"
               description="Changes the request sent to the ADFS server, this settings default value is NULL (which will not change anything). This changes the authentication when users access the org using the context https://orgName.domain.com/. Valid values are: &lt;br/&gt; an empty string (to reset to NULL use reset to default). &lt;br/&gt;&lt;b&gt;urn:federation:authentication:windows&lt;/b&gt; as a value uses - Integrated auth &lt;br/&gt;&lt;b&gt;urn:oasis:names:tc:SAML:1.0:am:password&lt;/b&gt; as a value uses -  Forms" />
   <orgSetting minSupportedVersion="5.0.9690.2903"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="DisableMapiCaching"
               min="null"
               max="null"
@@ -279,7 +290,7 @@
               urlTitle="Javascript &amp; CRM"
               description="Default: &lt;b&gt;True&lt;/b&gt;.  &lt;b&gt;False&lt;/b&gt;: will disable address book materialized views." />
   <orgSetting minSupportedVersion="5.0.9690.2903"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="AddressBookMaterializedViewsEnabled"
               min="null"
               max="null"
@@ -289,7 +300,7 @@
               urlTitle="KB2691237"
               description="Changes the way the CRM Client queries SQL CE. Default: &lt;b&gt;True&lt;/b&gt;.  &lt;b&gt;False&lt;/b&gt;: will disable address book materialized views." />
   <orgSetting minSupportedVersion="5.0.9690.2903"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="ClientDisableTrackingForReplyForwardEmails"
               min="0"
               max="1"
@@ -299,7 +310,7 @@
               urlTitle="KB2691237"
               description="Default: &lt;b&gt;0&lt;/b&gt;.  &lt;b&gt;1&lt;/b&gt;: disables tracking of replies and forwarded emails. " />
   <orgSetting minSupportedVersion="5.0.9690.2903"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="DisableImplicitSharingOfCommunicationActivities"
               min="null"
               max="null"
@@ -309,7 +320,7 @@
               urlTitle="KB2691237"
               description="Default: &lt;b&gt;False&lt;/b&gt;.  &lt;b&gt;True&lt;/b&gt;: disables  implicit sharing of records to recipients that are added to existing activities." />
   <orgSetting minSupportedVersion="5.0.9690.3233"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="DisableIECompatMode"
               min="null"
               max="null"
@@ -338,7 +349,7 @@
             urlTitle="KB2691237"
             description="Default: &lt;b&gt;False&lt;/b&gt;.  &lt;b&gt;True&lt;/b&gt;: " />
   <orgSetting minSupportedVersion="5.0.9690.3445"
-            maxSupportedVersion="5.0.9690.3731"
+            maxSupportedVersion="7.9.9999.9999"
             name="ActivateAdditionalRefreshOfWorkflowConditions"
             min="null"
             max="null"
@@ -348,7 +359,7 @@
             urlTitle="KB2691237"
             description="Default: &lt;b&gt;False&lt;/b&gt;.  &lt;b&gt;True&lt;/b&gt;: " />
   <orgSetting minSupportedVersion="5.0.9690.3541"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="ChangeDoubleQuoteToSingleQuote"
               min="null"
               max="null"
@@ -417,8 +428,11 @@
               supportUrl="http://support.microsoft.com/kb/2691237"
               urlTitle="None"
               description="Default: &lt;b&gt;true&lt;/b&gt;. Options are:&lt;br/&gt;true:Preserve existing behavior.&lt;br/&gt;false: Stop storing CRM Sync information in the PidTagSensitivity MAPI property which causes the error: error in the XML document on GetItem for IPM.MSCRMUserId on BlackerBerry Server Traces." />
+
+  <!--6.0.0.809  2013 RTM -->
   <orgSetting minSupportedVersion="6.0.0.809"
-              maxSupportedVersion="6.9.9999.9999" name="TabletClientMaxTabs"
+              maxSupportedVersion="7.9.9999.9999"
+              name="TabletClientMaxTabs"
               min="1"
               max="50"
               defaultValue="5"
@@ -427,25 +441,27 @@
               urlTitle="None"
               description="Default: &lt;b&gt;5&lt;/b&gt;.  Max tablet tabs." />
   <orgSetting minSupportedVersion="6.0.0.809"
-             maxSupportedVersion="6.9.9999.9999" name="TabletClientMaxLists"
-             min="1"
-             max="50"
-             defaultValue="10"
-             settingType="Number"
-             supportUrl="http://support.microsoft.com/kb/2691237"
-             urlTitle="None"
-             description="Default: &lt;b&gt;10&lt;/b&gt;.  Max tablet lists." />
+              maxSupportedVersion="7.9.9999.9999"
+              name="TabletClientMaxLists"
+              min="1"
+              max="50"
+              defaultValue="10"
+              settingType="Number"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="None"
+              description="Default: &lt;b&gt;10&lt;/b&gt;.  Max tablet lists." />
   <orgSetting minSupportedVersion="6.0.0.809"
-             maxSupportedVersion="6.9.9999.9999" name="TabletClientMaxFields"
-             min="1"
-             max="500"
-             defaultValue="75"
-             settingType="Number"
-             supportUrl="http://support.microsoft.com/kb/2691237"
-             urlTitle="None"
-             description="Default: &lt;b&gt;75&lt;/b&gt;.  Max mobile fields." />
+              maxSupportedVersion="7.9.9999.9999"
+              name="TabletClientMaxFields"
+              min="1"
+              max="500"
+              defaultValue="75"
+              settingType="Number"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="None"
+              description="Default: &lt;b&gt;75&lt;/b&gt;.  Max mobile fields." />
   <orgSetting minSupportedVersion="6.0.0.809"
-              maxSupportedVersion="6.9.9999.9999" name="EnableBulkReparent"
+              maxSupportedVersion="7.9.9999.9999" name="EnableBulkReparent"
               min="null"
               max="null"
               defaultValue="true"
@@ -454,25 +470,27 @@
               urlTitle="KB2691237"
               description="Default: &lt;b&gt;True&lt;/b&gt;.  &lt;b&gt;False&lt;/b&gt;: Disables and reparents using a one record at a time approach." />
   <orgSetting minSupportedVersion="6.0.0.809"
-             maxSupportedVersion="6.9.9999.9999" name="CreateSPFoldersUsingNameandGuid"
-             min="null"
-             max="null"
-             defaultValue="true"
-             settingType="Boolean"
-             supportUrl="http://support.microsoft.com/kb/2691237"
-             urlTitle="KB2691237"
-             description="Default: &lt;b&gt;True&lt;/b&gt; - creates SharePoint folders using the format of {Name}+{GUID}.  &lt;b&gt;False&lt;/b&gt;: Creates SharePoint folders using just the name." />
+              maxSupportedVersion="7.9.9999.9999" name="CreateSPFoldersUsingNameandGuid"
+              min="null"
+              max="null"
+              defaultValue="true"
+              settingType="Boolean"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="KB2691237"
+              description="Default: &lt;b&gt;True&lt;/b&gt; - creates SharePoint folders using the format of {Name}+{GUID}.  &lt;b&gt;False&lt;/b&gt;: Creates SharePoint folders using just the name." />
   <orgSetting minSupportedVersion="6.0.0.809"
-            maxSupportedVersion="6.9.9999.9999" name="TraceExchangeSyncData"
-            min="null"
-            max="null"
-            defaultValue="true"
-            settingType="Boolean"
-            supportUrl="http://support.microsoft.com/kb/2691237"
-            urlTitle="KB2691237"
-            description="Default: &lt;b&gt;False&lt;/b&gt;.  &lt;b&gt;True&lt;/b&gt;: Enabled exchange sync tracing." />
+              maxSupportedVersion="7.9.9999.9999" name="TraceExchangeSyncData"
+              min="null"
+              max="null"
+              defaultValue="true"
+              settingType="Boolean"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="KB2691237"
+              description="Default: &lt;b&gt;False&lt;/b&gt;.  &lt;b&gt;True&lt;/b&gt;: Enabled exchange sync tracing." />
+
+  <!--6.0.1.61  2013 UR1 -->
   <orgSetting minSupportedVersion="6.0.1.61"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="AllowPromoteDuplicates"
               min="null"
               max="null"
@@ -482,18 +500,19 @@
               urlTitle="None"
               description="V6 Default: &lt;b&gt;False&lt;/b&gt;. Options are: &lt;b&gt;False&lt;/b&gt;: Does not allow for the promotion of duplicate records.   &lt;b&gt;True&lt;/b&gt;: Allows for the promotion of duplicate records. &lt;br/&gt;&lt;b&gt;NOTE:&lt;/b&gt; This setting is NOT SUPPORTED IN CRM2013 as of build 809." />
   <orgSetting minSupportedVersion="6.0.1.61"
-             maxSupportedVersion="6.9.9999.9999"
-             name="EnableReLinkingToExistingCRMRecord"
-             min="0"
-             max="1"
-             defaultValue="0"
-             settingType="Number"
-             supportUrl="http://support.microsoft.com/kb/2691237"
-             urlTitle="KB2691237"
-             description="V6 Default: &lt;b&gt;False&lt;/b&gt;.  &lt;b&gt;True&lt;/b&gt;: " />
-  <!--6.1.0.581 SP1-->
+              maxSupportedVersion="7.9.9999.9999"
+              name="EnableReLinkingToExistingCRMRecord"
+              min="0"
+              max="1"
+              defaultValue="0"
+              settingType="Number"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="KB2691237"
+              description="V6 Default: &lt;b&gt;False&lt;/b&gt;.  &lt;b&gt;True&lt;/b&gt;: " />
+
+  <!--6.1.0.581 2013 SP1-->
   <orgSetting minSupportedVersion="6.1.0.581"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="SecuritySettingForEmail"
               min="1"
               max="3"
@@ -503,17 +522,17 @@
               urlTitle="None"
               description="Added back in 6.1.0.581! Default: &lt;b&gt;1&lt;/b&gt;. Options are:&lt;br/&gt;1:Display a Warning Message And give an option to open&lt;br/&gt;2: Display a Warning Message and do not give an option to open &lt;br/&gt;3: Do not display a Warning Message and do not give any option to open. &lt;br/&gt;&lt;b&gt;NOTE:&lt;/b&gt; This setting is NOT SUPPORTED IN CRM2013 as of build 809." />
   <orgSetting minSupportedVersion="6.1.0.581"
-              maxSupportedVersion="6.9.9999.9999"
-                name="GrantSharedAccessForMergeToSubordinateOwner"
-                min="null"
-                max="null"
-                defaultValue="true"
-                settingType="Boolean"
-                supportUrl="http://support.microsoft.com/kb/2691237"
-                urlTitle="None"
-                description="Added back in 6.1.0.581! Default: &lt;b&gt;true&lt;/b&gt;. Options are:&lt;br/&gt;true:Copy all inhertied shares from master share records&lt;br/&gt;false: Do not copy master records inherited shares." />
+              maxSupportedVersion="7.9.9999.9999"
+              name="GrantSharedAccessForMergeToSubordinateOwner"
+              min="null"
+              max="null"
+              defaultValue="true"
+              settingType="Boolean"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="None"
+              description="Added back in 6.1.0.581! Default: &lt;b&gt;true&lt;/b&gt;. Options are:&lt;br/&gt;true:Copy all inhertied shares from master share records&lt;br/&gt;false: Do not copy master records inherited shares." />
   <orgSetting minSupportedVersion="6.1.0.581"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="ListComponentInstalled"
               min="null"
               max="null"
@@ -523,7 +542,7 @@
               urlTitle="None"
               description="Added back in 6.1.0.581! If CRM and SharePoint use ADFS and users click to create a folder for a record in CRM 2013, intermittently, the SharePoint page is shown instead of the list part grid page causing confusion with users. This setting allows you to force CRM to use the installed list grid component in SharePoint when using ADFS. &lt;br/&gt;Default: &lt;b&gt;false&lt;/b&gt;. Options are:&lt;br/&gt;false: use the standard method of detecting Sharepoint Authentication&lt;br/&gt;true: If CRM and SharePoint have ADFS enabled, force CRM to use the grid display." />
   <orgSetting minSupportedVersion="6.1.0.581"
-              maxSupportedVersion="6.9.9999.9999"
+              maxSupportedVersion="7.9.9999.9999"
               name="StoreOutlookSyncDataInSensitivityProperty"
               min="null"
               max="null"
@@ -533,38 +552,141 @@
               urlTitle="None"
               description="Added back in 6.1.0.581! Default: &lt;b&gt;true&lt;/b&gt;. Options are:&lt;br/&gt;true:Preserve existing behavior.&lt;br/&gt;false: Stop storing CRM Sync information in the PidTagSensitivity MAPI property which causes the error: error in the XML document on GetItem for IPM.MSCRMUserId on BlackerBerry Server Traces." />
   <orgSetting minSupportedVersion="6.1.0.581"
-           maxSupportedVersion="6.9.9999.9999"
-           name="EnableCrmStatecodeOnOutlookCategory"
-           min="null"
-           max="null"
-           defaultValue="True"
-           settingType="Boolean"
-           supportUrl="http://support.microsoft.com/kb/2691237"
-           urlTitle="KB2691237"
-           description="Enable Statecode data on contact sync. Default: &lt;b&gt;True&lt;/b&gt;.  &lt;b&gt;False&lt;/b&gt;: " />
-  <orgSetting minSupportedVersion="6.1.1.123"
-           maxSupportedVersion="6.9.9999.9999"
-           name="ClearSystemUserPrincipalsWhenDisable"
-           min="null"
-           max="null"
-           defaultValue="True"
-           settingType="Boolean"
-           supportUrl="http://support.microsoft.com/kb/2691237"
-           urlTitle="KB2691237"
-           description="Clear and/or populates SystemUserPrincipals values for systemUsers when they're disabled/enabled. Default: &lt;b&gt;True&lt;/b&gt;.  &lt;b&gt;False&lt;/b&gt;: " />
+              maxSupportedVersion="7.9.9999.9999"
+              name="EnableCrmStatecodeOnOutlookCategory"
+              min="null"
+              max="null"
+              defaultValue="True"
+              settingType="Boolean"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="KB2691237"
+              description="Enable Statecode data on contact sync. Default: &lt;b&gt;True&lt;/b&gt;.  &lt;b&gt;False&lt;/b&gt;: " />
+
+  <!-- 6.1.1.132 2013 SP1 UR1 -->
+  <orgSetting minSupportedVersion="6.1.1.132"
+              maxSupportedVersion="7.9.9999.9999"
+              name="ClearSystemUserPrincipalsWhenDisable"
+              min="null"
+              max="null"
+              defaultValue="True"
+              settingType="Boolean"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="KB2691237"
+              description="Clear and/or populates SystemUserPrincipals values for systemUsers when they're disabled/enabled. Default: &lt;b&gt;True&lt;/b&gt;.  &lt;b&gt;False&lt;/b&gt;: " />
+  <orgSetting minSupportedVersion="6.1.1.132"
+            maxSupportedVersion="7.9.9999.9999"
+            name="SetRegardingLookupDefaultEntityType"
+            min="null"
+            max="null"
+            defaultValue=""
+            settingType="String"
+            supportUrl="http://support.microsoft.com/kb/2691237"
+            urlTitle="KB 2691237"
+            description="Change default entity for Regarding Lookup Dialog" />
+
+  <!--7.0.0.3027 2015 RTM-->
+  <orgSetting minSupportedVersion="7.0.0000.3027"
+              maxSupportedVersion="7.9.9999.9999"
+              name="DoNotIgnoreInternalEmailToQueues"
+              min="null"
+              max="null"
+              defaultValue="false"
+              settingType="Boolean"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="KB 2691237"
+              description="If you disable the &quot;Track e-mail sent between CRM users as two activities&quot; setting, e-mail messages from a CRM user to a queue are not delivered. Additionally, if a workflow rule sends an e-mail message to a queue, e-mail messages that are sent by the workflow rule are not delivered. &lt;b&gt;False&lt;/b&gt; - Internal e-mail messages to queues will not be delivered. &lt;b&gt;True&lt;/b&gt; - Internal e-mail messages to queues will be delivered." />
+  <orgSetting minSupportedVersion="7.0.0000.3027"
+              maxSupportedVersion="7.9.9999.9999"
+              name="MaximumChildUsersCountLimitBeforeUsingJoinForHSM"
+              min="1"
+              max="2147483647"
+              defaultValue="80"
+              settingType="Number"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="KB 2691237"
+              description="Maximum Child/Subordinate Users Count Before Using a Join For HSM" />
+  <orgSetting minSupportedVersion="7.0.0000.3027"
+              maxSupportedVersion="7.9.9999.9999"
+              name="DisableLookupMruOnOutlookOffline"
+              min="null"
+              max="null"
+              defaultValue="false"
+              settingType="Boolean"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="KB 2691237"
+              description="LookupMRUItems in UserEntityUISettings can cause a large data volume when going online, setting this to &lt;b&gt;true&lt;/b&gt; will stop MRU's from syncing back ONLINE.  The default of &lt;b&gt;false&lt;/b&gt; will have users OFFLINE outlook clients sync the MRU items back to the server after being offline.  To reduce the time taken to go back ONLINE for offline client users you can set this to &lt;b&gt;true&lt;/b&gt;." />
+  <orgSetting minSupportedVersion="7.0.0000.3027"
+              maxSupportedVersion="7.9.9999.9999"
+              name="HierarchyLevelForHierarchyFeature"
+              min="1" max="100"
+              defaultValue="3"
+              settingType="Number"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="KB 2691237"
+              description="HierarchyLevelForHierarchyFeature - the hierarchy level used for hierarchal security." />
+  <orgSetting minSupportedVersion="7.0.0000.3027"
+              maxSupportedVersion="7.9.9999.9999"
+              name="PageSizeForHierarchyFeature"
+              min="1" max="5000"
+              defaultValue="5"
+              settingType="Number"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="KB 2691237"
+              description="PageSizeForHierarchyFeature - the hierarchy page size used for hierarchal security." />
+  <orgSetting minSupportedVersion="7.0.0000.3027"
+              maxSupportedVersion="7.9.9999.9999"
+              name="TabletClientMaxMashups"
+              min="1"
+              max="100"
+              defaultValue="3"
+              settingType="Number"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="KB 2691237"
+              description="TabletClientMaxMashups" />
+  <orgSetting minSupportedVersion="7.0.0000.3027"
+              maxSupportedVersion="7.9.9999.9999"
+              name="DisableClientUpdateNotification"
+              min="null" max="null"
+              defaultValue="false"
+              settingType="Boolean"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="KB 2691237"
+              description="Setting DisableClientUpdateNotification to &lt;b&gt;true&lt;/b&gt; will disable the outlook client from checking for newer versions." />
+  <orgSetting minSupportedVersion="7.0.0000.3027"
+              maxSupportedVersion="7.9.9999.9999"
+              name="MinRowCountForFKIndexCreateInReferencingEntity"
+              min="1" max="2147483647"
+              defaultValue="5000"
+              settingType="Number"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="KB 2691237"
+              description="Setting min row count in &lt;b&gt;referencing&lt;/b&gt; table for ForeignKey index creation" />
+  <orgSetting minSupportedVersion="7.0.0000.3027"
+              maxSupportedVersion="7.9.9999.9999"
+              name="MinRowCountForFKIndexCreateInReferencedEntity"
+              min="1" max="2147483647"
+              defaultValue="100"
+              settingType="Number"
+              supportUrl="http://support.microsoft.com/kb/2691237"
+              urlTitle="KB 2691237"
+              description="Setting min row count in &lt;b&gt;referenced&lt;/b&gt; table for ForeignKey index creation" />
   <!--
+ CRM 2015: 
+  7.0.0000.3027 2015 RTM
+ 
  CRM 2013: 
   6.0.0.809 is RTM 
-  6.0.1.61 is UR1 
-  6.0.2.46 is UR2
-  6.1.0.581 is SP1 
-  6.1.1.123 is SP1 UR1
+  6.0.1.61  is UR1 
+  6.0.2.46  is UR2 - no new settings found
+  6.0.3.106 is UR3 - settings not checked
+  6.1.0.581 is SP1 RTM
+  6.1.1.132 is SP1 UR1 
  
- CRM 2011
+ CRM 2011: 
+  4150 is UR17 - not checked for new settings yet
   3911 is UR16
   3731 is UR15
-  3557 is UR14
-  3541 is UR14-A test Release build#a
+  3541 - 3557 UR14
   3445 is UR13
   3236 is ur12 
   2903 is ur11CU-COD
diff --git a/mspfedyn_/OrgDbOrgSettings/orgDBOrgSettings.html b/mspfedyn_/OrgDbOrgSettings/orgDBOrgSettings.html
index 911507b..e389e9d 100644
--- a/mspfedyn_/OrgDbOrgSettings/orgDBOrgSettings.html
+++ b/mspfedyn_/OrgDbOrgSettings/orgDBOrgSettings.html
@@ -77,7 +77,7 @@
                     });
                 }
             },
-            getSettingsXmlFromUrl: function (settingsXmlPath, successCallback, errorCallback) {
+            getSettingsXmlFromUrl: function (settingsXmlPath) {
                 ///<summary>Async retrieve settings xml from the server</summary>
                 ///<param name='settingsXmlPath' type='String'>Relative path of the settings.xml file</param>
                 ///<param name="successCallback" Type="Function">The function to perform when an successfult response is returned.
@@ -86,45 +86,31 @@
                 /// The function to perform when an error is returned. 
                 /// This function accepts a JScript error returned by the _getError function</param>
                 ///<var name="req" Type="XMLHttpRequest">The XMLHttpRequest</var>
-                o$.ajax({
+                return o$.ajax({
                     timeout: SDK.Settings.ajaxTimeout,
                     type: "GET",
                     datatype: "xml",
                     url: settingsXmlPath,
                     data: null,
-                    beforeSend: function (XMLHttpRequest) { },
-                    success: function (results, textStatus, XmlHttpRequest) {
-                        successCallback(XmlHttpRequest.responseText);
-                    },
-                    error: function (XMLHttpRequest, textStatus, errorThrown) {
-                        errorCallback(errorThrown);
-                    },
-                    complete: function (XMLHttpRequest, status) { }
+                    beforeSend: function (XMLHttpRequest) { }
                 });
             },
             //free up the UI - TODO change these functions to allow for Chaining of done, error, complete, etc... 
-            getOrgDbOrgSettingsFromCRM: function (successCallback, errorCallback) {
+            getOrganizationEntityFromCrm: function () {
                 ///<summary>Async retrieves the current orgdborgsettings from Dynamics CRM</summary>
-                ///<param name="successCallback" Type="Function(organizationSet[0])">The function to perform when an successfult response is returned. 
-                ///Should accept a single parameter which will accept an argument of type BuildVersion</param>
-                ///<param name="errorCallback" Type="Function">The function to perform when an error is returned.</param>
+                ///<returns type='jqXHR'>Ajax Query Object</returns>
                 var rootUrl = this.getOrgRootUrl(); //required IE8
-                o$.ajax({
+                return o$.ajax({
                     timeout: SDK.Settings.ajaxTimeout,
                     type: "GET",
                     contentType: "application/json; charset=utf-8",
                     datatype: "json",
-                    url: rootUrl + "/XRMServices/2011/OrganizationData.svc/OrganizationSet?$select=OrganizationId,Name,OrgDbOrgSettings",
+                    url: rootUrl + "/XRMServices/2011/OrganizationData.svc/OrganizationSet",
+                    //url: rootUrl + "/XRMServices/2011/OrganizationData.svc/OrganizationSet?$select=OrganizationId,Name,OrgDbOrgSettings",
                     data: null,
                     beforeSend: function (XMLHttpRequest) {
                         //Specifying this header ensures that the results will be returned as JSON.
                         XMLHttpRequest.setRequestHeader("Accept", "application/json");
-                    },
-                    success: function (results, textStatus, XmlHttpRequest) {
-                        successCallback(results);
-                    },
-                    error: function (XMLHttpRequest, textStatus, errorThrown) {
-                        alert("There was an error retrieving your orgDBOrgSettings: " + errorThrown);
                     }
                 });
             },
@@ -183,8 +169,50 @@
                 //    }
                 //});
             },
+            getOrganizationAttributeValue: function (attributeName) {
+                ///<returns type='jqXHR'>Returns ajax query</returns> 
+                var rootUrl = this.getOrgRootUrl();  //IE8 required
+                return o$.ajax({
+                    timeout: SDK.Settings.ajaxTimeout,
+                    type: "GET",
+                    contentType: "application/json; charset=utf-8",
+                    datatype: "json",
+                    url: rootUrl + "/XRMServices/2011/OrganizationData.svc/OrganizationSet?$select=OrganizationId,Name," + attributeName,
+                    data: null,
+                    beforeSend: function (XMLHttpRequest) {
+                        //Specifying this header ensures that the results will be returned as JSON.
+                        XMLHttpRequest.setRequestHeader("Accept", "application/json");
+                    }
+                });
+            },
+            setOrganizationAttributeValue: function (attributeName, attributeValue, organizationId) {
+                ///<summary>Async updates organizationbase attribute value</summary>
+                ///<param name='attributeName' type='String'>attribute name to update</param>
+                ///<param name="attributeValue" Type="Object">the value of the attribute to set</param>
+                ///<param name="organizationId" type="String">Org ID Guid to update in CRM</param> 
+                ///<returns type='jqXHR'>Returns ajax query</returns> 
+                var rootUrl = this.getOrgRootUrl();  //IE8 required
+
+                //create blank object and dynamically add the dynamic value
+                var update = {};
+                update[attributeName] = attributeValue;
+
+                return o$.ajax({
+                    timeout: SDK.Settings.ajaxTimeout,
+                    type: "POST",
+                    contentType: "application/json; charset=utf-8",
+                    datatype: "json",
+                    url: rootUrl + "/XRMServices/2011/OrganizationData.svc/OrganizationSet" + "(guid'" + organizationId + "')",
+                    data: oJSON.stringify(update),
+                    beforeSend: function (XMLHttpRequest) {
+                        XMLHttpRequest.setRequestHeader("Accept", "application/json");
+                        XMLHttpRequest.setRequestHeader("X-HTTP-Method", "MERGE");
+                    },
+                });
+            },
             //follows better pattern to impliment success/fail/complete
             getCrmSolutionVersion: function () {
+                ///<returns type='jqXHR'>Returns ajax query</returns> 
                 ///<returns type='jqXHR'>Returns ajax query</returns> 
                 var rootUrl = this.getOrgRootUrl();  //IE8 required
                 return o$.ajax({
@@ -348,6 +376,7 @@
         };
         SDK.Settings = {
             ajaxTimeout: 30000,
+            crmServerDBVersion: new BuildVersion(0, 0, 0, 0),
             azureClient: null,
             daysOfCache: 7,
             azureMobileUrl: "https://orgdborgsettings.azure-mobile.net/",
@@ -365,6 +394,7 @@
             projectIEDocumentationUrl: "https://orgdborgsettings.codeplex.com/wikipage?title=IE8%20Settings",
             projectIECompatDocUrl: "https://orgdborgsettings.codeplex.com/wikipage?title=CRM%20Disable%20IE%20Compatibility%20Mode",
             _localSettingsCollection: {},
+            CRMOrganizationResults: {}, //the result of an odata call for all organization columns 
             LocalStorage: {
                 supports_html5_storage: function () {
                     try {
@@ -449,9 +479,9 @@
                             SDK.Settings.azureClient.getTable('applicationVersion')
                                 .select('VersionNumber', 'DownloadUrl', 'PublishedDate')
                                 .where(
-                                function (dateCompare) {
-                                    return this.PublishedDate <= dateCompare;
-                                }, new Date().toISOString())
+                                function (dateCompare, majorVersion) {
+                                    return this.PublishedDate <= dateCompare && this.MinCrmVersion <= majorVersion && this.MaxCrmVersion >= majorVersion;
+                                }, new Date().toISOString(), SDK.Settings.crmServerDBVersion.major)
                                 .take(1)
                                 .orderByDescending('PublishedDate')
                                 .read()
@@ -663,45 +693,6 @@
                 });
                 return retVal;
             },
-            update: function (name, value) {
-                /// <summary>Updates the current value of a given setting by name</summary>
-                /// <param name='name' type='orgSetting'>Setting object to update</param> 
-                /// <param name='value' type='String'>Value of the setting as a string</param>
-                //DataType Sensative
-                var parseFailure = false;
-                var setting = this.getSetting(name);
-                switch (setting.type.toString().toLowerCase()) {
-                    case "string":
-                        setting.value = settingStringValue;
-                        //settingObj.value = settingStringValue.toLowerCase()==="null" ? null : settingStringValue; 
-                        break;
-                    case "boolean": //parse text and convert
-                        if ((settingStringValue || "null").toLowerCase() === "true") {
-                            setting.value = true;
-                        }
-                        else if ((settingStringValue || "null").toLowerCase() === "false") {
-                            setting.value = false;
-                        }
-                        else {
-                            parseFailure = true;
-                        }
-                        break;
-                    case "number":
-                        var num = parseInt(settingStringValue);
-                        num === NaN ? parseFailure = true : setting.value = parseInt(settingStringValue);
-                        break;
-                    case "double":
-                        var num = parseFloat(settingStringValue);
-                        num === NaN ? parseFailure = true : setting.value = parseFloat(settingStringValue);
-                        break;
-                    default:
-                        parseFailure = true;
-                        break;
-                }
-                if (parseFailure) {
-                    throw Error("Cannot parse the setting with name: " + setting.name + " and value of: " + settingStringValue + " with the type of: " + setting.type.toString());
-                }
-            },
             addSetting: function (OrganizationSetting) {
                 ///<summary>Adds another orgSetting object to the OrgSettingsCollection instance array.</summary>
                 ///<param name='OrganizationSetting' type='orgSetting'>Organization Setting</param>
@@ -721,13 +712,14 @@
             },
             _settings: new Array()
         };
-        function orgSetting(name, value, type, min, max, defaultValue, supportUrl, description, minSupportedVersion, urlTitle, maxSupportedVersion) {
+        function orgSetting(name, value, type, min, max, defaultValue, supportUrl, description, minSupportedVersion, urlTitle, maxSupportedVersion, isOrganizationAttribute) {
             /// <summary>Object defention of orgSetting</summary> 
             /// <param name='name' type='String'>Setting name</param>
             /// <param name='value' type='Object'>Setting value</param>
             /// <param name='type' type='Type'>Underlying object Type of the setting value</param>
             /// <param name='min' type='Number'>Minimum Int value</param>
             /// <param name='max' type='Number'>Maximum Int value</param>
+            /// <param name='isOrganizationAttribute' type='Boolean'>Does this setting exist in the OrganizationEntity? (Not orgDbOrgSettings)</param>
             /// <returns type="orgSetting">An instance of an orgSetting()</returns>
             this.name = name;
             this.value = value
@@ -740,46 +732,14 @@
             this.minSupportedVersion = minSupportedVersion;
             this.maxSupportedVersion = maxSupportedVersion;
             this.urlTitle = urlTitle || "No URL";
+            this.isOrganizationAttribute = isOrganizationAttribute || false; //default to false
         };
         orgSetting.prototype = {
             parseStringToValue: function (value) {
                 ///<summary>Parses a value and returns the type.</summary>
                 ///<param name='value' type='String'>String representation of the value</param>
                 ///<returns type='Object'>typed value</returns>
-                //DataType Sensative
-                var parseFailure = false, retval;
-                switch (this.type.toString().toLowerCase()) {
-                    case "string":
-                        retval = value;
-                        //settingObj.value = settingStringValue.toLowerCase()==="null" ? null : settingStringValue; 
-                        break;
-                    case "boolean": //parse text and convert
-                        if ((value || "null").toLowerCase() === "true") {
-                            retval = true;
-                        }
-                        else if ((value || "null").toLowerCase() === "false") {
-                            retval = false;
-                        }
-                        else {
-                            parseFailure = true;
-                        }
-                        break;
-                    case "number":
-                        var num = parseInt(value);
-                        num === NaN ? parseFailure = true : retval = parseInt(value);
-                        break;
-                    case "double":
-                        var num = parseFloat(value);
-                        num === NaN ? parseFailure = true : retval = parseFloat(value);
-                        break;
-                    default:
-                        parseFailure = true;
-                        break;
-                }
-                if (parseFailure) {
-                    throw Error("Cannot parse the setting with name: " + this.name + " and value of: " + value + " with the type of: " + this.type.toString());
-                }
-                return retval;
+                return parseValueFromTypeName(this.type, value);
             },
             toXmlForUpdate: function (useDefaultValue) {
                 /// <Summary>Returns the setting XML for an update to CRM</Summary>
@@ -810,6 +770,9 @@
                     throw "Default value is not valid!";
                 }
             },
+            defaultValue: function () {
+                return this.defaultValue;
+            },
             toXmlForDefaultValue: function () {
                 /// <Summary>returns the setting XML representation for an update</Summary>
                 /// <returns type'String'>XML for an orgDbOrgSetting update to CRM</returns>
@@ -872,6 +835,46 @@
                 return (this.value == null ? false : true)
             }
         };
+
+        function parseValueFromTypeName(TypeName, Value) {
+            ///<summary>Parses a value and returns the type.</summary>
+            ///<param name='TypeName' type='String'>A String defining which type of value to parse [string|boolean|number|double]</param>
+            ///<param name='Value' type='String'>String representation of the value</param>
+            ///<returns type='Object'>typed value</returns>
+            //DataType Sensative
+            var parseFailure = false, retval;
+            switch (TypeName.toString().toLowerCase()) {
+                case "string":
+                    retval = Value;
+                    break;
+                case "boolean": //parse text and convert
+                    if ((Value || "null").toLowerCase() === "true") {
+                        retval = true;
+                    }
+                    else if ((Value || "null").toLowerCase() === "false") {
+                        retval = false;
+                    }
+                    else {
+                        parseFailure = true;
+                    }
+                    break;
+                case "number":
+                    var num = parseInt(Value);
+                    num === NaN ? parseFailure = true : retval = parseInt(Value);
+                    break;
+                case "double":
+                    var num = parseFloat(Value);
+                    num === NaN ? parseFailure = true : retval = parseFloat(Value);
+                    break;
+                default:
+                    parseFailure = true;
+                    break;
+            }
+            if (parseFailure) {
+                throw Error("Cannot parse the value of: " + Value + " with the type of: " + this.type.toString());
+            }
+            return retval;
+        };
         function upsertSetting(settingName, settingValue, resetToDefault) {
             ///<summary>If setting exists it is updated, if it does not yet exist it's inserted with the default value</summary>
             try {
@@ -898,21 +901,36 @@
                     }
                     //submit the xml change from our clone which is not bound to the UI setting
                     //in the future updateOrgDbOrgSetting should sort this out by itself 
-                    SDK.SOAP.updateOrgDbOrgSettingOnServer(
-                        cloneSetting.toXmlForUpdate(), //setting.toXmlForUpdate(),
-                        SDK.Settings.OrganizationId,
-                        success = function () {
+                    if (setting.isOrganizationAttribute) {
+                        SDK.SOAP.setOrganizationAttributeValue(
+                            settingName,
+                            settingValue,
+                            SDK.Settings.OrganizationId)
+                        .done(function (results, textStatus, XmlHttpRequest) {
                             setting.update(settingValue); //update the underlying value in the UI
                             printSettingsToDiv();
-                        },
-                        error = function (error) {
-                            dumpErrorInBanner(error);
                             enableProgressDiv(false);
-                            //o$('#addBox').css('visibility', 'visible');
-                        },
-                        complete = function () {
+                        }).fail(function (jqXHR, textStatus, errorThrown) {
+                            dumpErrorInBanner(error);
                             enableProgressDiv(false);
                         });
+                    }
+                    else {
+                        SDK.SOAP.updateOrgDbOrgSettingOnServer(
+                            cloneSetting.toXmlForUpdate(), //setting.toXmlForUpdate(),
+                            SDK.Settings.OrganizationId,
+                            success = function () {
+                                setting.update(settingValue); //update the underlying value in the UI
+                                printSettingsToDiv();
+                            },
+                            error = function (error) {
+                                dumpErrorInBanner(error);
+                                enableProgressDiv(false);
+                            },
+                            complete = function () {
+                                enableProgressDiv(false);
+                            });
+                    }
                 }
             }
             catch (e) {
@@ -935,55 +953,69 @@
         function deleteSetting(strSettingToDelete) {
             if (confirm("Are you absolutely sure you want to remove: " + strSettingToDelete + "?") && confirm("This functionality is still experimental, be sure to take a screenshot of your settings before you do this.\r\nDo you still wish to proceed?\r\n\r\nTechnically this deletes all settings from CRM then adds all the settings back with the exception of " + strSettingToDelete + ".")) {
                 enableProgressDiv(true);
-                //submit the xml change from our clone which is not bound to the UI setting
-                //in the future updateOrgDbOrgSetting should sort this out by itself 
-                SDK.SOAP.updateOrgDbOrgSettingOnServer(
-                    "", //push through an empty string,
-                    SDK.Settings.OrganizationId,
-                    success = function () {
-                        try {
-                            var finalXmlUpdate = "";
-                            //try to store all the settings off 
-                            o$.each(SDK.Settings.OrganizationSettings.getAllSettings(), function (index, setting) {
-                                ///<param name="setting" type="orgSetting"/>
-                                ///<param name="index" type="int"/> 
-                                if (setting != null && setting.value != null && setting.name != strSettingToDelete) {
-                                    finalXmlUpdate += setting.toRawXmlSetting(false);
-                                }
-                            });
-                            if (finalXmlUpdate.length > 0) {
-                                finalXmlUpdate = '<orgSettings>' + finalXmlUpdate + '</orgSettings>';
 
-                                SDK.SOAP.updateOrgDbOrgSettingOnServer(
-                                    finalXmlUpdate, //push through an empty string,
-                                    SDK.Settings.OrganizationId,
-                                    success = function () {
-                                    },
-                                    error = function (error) {
-                                        dumpErrorInBanner(error);
-                                    },
-                                    complete = function () {
-                                        SDK.Settings.OrganizationSettings.clear(); //clear currently stored settings
-                                        onPageLoad();//refresh the entire page
-                                    });
+                var settingToDelete = SDK.Settings.OrganizationSettings.getSetting(strSettingToDelete);
+                if (settingToDelete.isOrganizationAttribute) {
+                    SDK.SOAP.setOrganizationAttributeValue(settingToDelete.name, settingToDelete.defaultValue, SDK.Settings.OrganizationId)
+                        .done(function (results, textStatus, XmlHttpRequest) {
+                            SDK.Settings.OrganizationSettings.clear(); //clear currently stored settings
+                            onPageLoad();//refresh the entire page
+                        })
+                        .fail(function (jqXHR, textStatus, errorThrown) {
+                            dumpErrorInBanner(errorThrown);
+                        });
+                }
+                else {
+                    //submit the xml change from our clone which is not bound to the UI setting
+                    //in the future updateOrgDbOrgSetting should sort this out by itself 
+                    SDK.SOAP.updateOrgDbOrgSettingOnServer(
+                        "", //push through an empty string,
+                        SDK.Settings.OrganizationId,
+                        success = function () {
+                            try {
+                                var finalXmlUpdate = "";
+                                //try to store all the settings off 
+                                o$.each(SDK.Settings.OrganizationSettings.getAllSettings(), function (index, setting) {
+                                    ///<param name="setting" type="orgSetting"/>
+                                    ///<param name="index" type="int"/> 
+                                    if (setting != null && setting.value != null && setting.name != strSettingToDelete && !setting.isOrganizationAttribute) {
+                                        finalXmlUpdate += setting.toRawXmlSetting(false);
+                                    }
+                                });
+                                if (finalXmlUpdate.length > 0) {
+                                    finalXmlUpdate = '<orgSettings>' + finalXmlUpdate + '</orgSettings>';
+
+                                    SDK.SOAP.updateOrgDbOrgSettingOnServer(
+                                        finalXmlUpdate, //push through an empty string,
+                                        SDK.Settings.OrganizationId,
+                                        success = function () {
+                                        },
+                                        error = function (error) {
+                                            dumpErrorInBanner(error);
+                                        },
+                                        complete = function () {
+                                            SDK.Settings.OrganizationSettings.clear(); //clear currently stored settings
+                                            onPageLoad();//refresh the entire page
+                                        });
+                                }
+                                else {
+                                    SDK.Settings.OrganizationSettings.clear(); //clear currently stored settings
+                                    onPageLoad();//refresh the entire page
+                                }
                             }
-                            else {
-                                SDK.Settings.OrganizationSettings.clear(); //clear currently stored settings
-                                onPageLoad();//refresh the entire page
+                            catch (e) {
+                                dumpErrorInBanner(e);
+                                SDK.Settings.OrganizationSettings.clear();
+                                onPageLoad();//todo ... this creates a ton of duplicate settings 
                             }
-                        }
-                        catch (e) {
-                            dumpErrorInBanner(e);
-                            SDK.Settings.OrganizationSettings.clear();
-                            onPageLoad();//todo ... this creates a ton of duplicate settings 
-                        }
-                    },
-                    error = function (error) {
-                        dumpErrorInBanner(error);
-                        enableProgressDiv(false);
-                    },
-                    complete = function () {
-                    });
+                        },
+                        error = function (error) {
+                            dumpErrorInBanner(error);
+                            enableProgressDiv(false);
+                        },
+                        complete = function () {
+                        });
+                }
             }
         };
         function launchDivEditor(settingName) {
@@ -1012,7 +1044,13 @@
                 var hasCurrentValue = (setting.value == null ? false : true);
                 var currentValueTD = '<td>not set</td>';
                 //changes background of settings that differ from the default 
-                if (hasCurrentValue && setting.value.toString() !== setting.defaultValue.toString()) {
+                if (setting.isOrganizationAttribute && setting.value.toString() !== setting.defaultValue.toString()) {
+                    currentValueTD = '<td style="background-color:RGB(240,240,240);"><b>' + setting.value + '</b></td>';
+                }
+                else if (setting.isOrganizationAttribute && setting.value.toString() === setting.defaultValue.toString()) {
+                    currentValueTD = '<td><b>' + setting.value + '<b></td>';
+                }
+                else if (hasCurrentValue && (setting.value.toString() !== setting.defaultValue.toString() || setting.isOrganizationAttribute)) {
                     currentValueTD = '<td style="background-color:RGB(240,240,240);"><b>' + setting.value + '</b></td>';
                 }
                 else if (hasCurrentValue && setting.value.toString() === setting.defaultValue.toString()) {
@@ -1025,6 +1063,8 @@
             //show prompt for changes: 
             o$('#chkPromptBeforeChange').css('visibility', 'visible');
             o$('#lblPromptLabel').css('visibility', 'visible');
+
+
         };
         function setupHelpers() {
             //try to load AzureMobile, if we fail we'll do it silently - problem here is that we cannot catch the error message from AzureMobile :(
@@ -1082,12 +1122,7 @@
         function resetBanner() {
             updateBanner("", true);
         };
-        function setJavascriptGlobals(orgSettingsCollection, organizationId) {
-            ///<param name="orgSettingsCollection" type="OrgSettingsCollection">Collection of the current CRM orgs settings</param>
-            ///<param name="organizationId" type="Guid">Guid of the CRM Organization</param>
-            SDK.Settings.OrganizationSettings = orgSettingsCollection;
-            SDK.Settings.OrganizationId = organizationId;
-        };
+
         function onPageLoad() {
             /*
              - Do some setup
@@ -1098,63 +1133,81 @@
              - then paint the grid? 
              */
             //alert user of other settings if OnPrem
-            if (!(Xrm.Page.context.getServerUrl().toLowerCase().indexOf(".dynamics.com") !== -1)) {
+            var urlFunction = Xrm.Page.context.getClientUrl() || Xrm.Page.context.getServerUrl();
+            if (!(urlFunction.toLowerCase().indexOf(".dynamics.com") !== -1)) {
                 updateBanner("Your environment is OnPremise, these settings may need to be checked against the ConfigDB(PowerShell) and Registry settings.", false, "onpremmsg");
             }
-            enableProgressDiv(true);
             setupHelpers();//sets up the page and object helpers necessary to do our work 
             try {
-                SDK.SOAP.getCrmServerVersion(
-                    function (serverBuildVersion) {
-                        ///<param name='serverBuildVersion' type='BuildVersion'></param>
-                        //fire another 'thread' off to check solution and versions - then compare them
-                        getLatestCrmSolutionVersion(false);
-                        //on success - print build version 
-                        o$('#ServerVersionDiv')
-                            .html("<i>Server version (from about page): " +
-                                serverBuildVersion.toBuildNumberString() +
-                                "</i>")
-                            .css('visibility', 'visible');
-                        //proceed to retrieving settings xml 
-                        SDK.SOAP.getSettingsXmlFromUrl(
-                            "settings.xml",
-                            success = function (responseXML) {
-                                var baseOrgSettings = new OrgSettingsCollection();
-                                //success - parse XML into settings 
-                                var xmlDoc = o$.parseXML(responseXML);
-                                o$(xmlDoc).find('defaultorgSettings').children().each(function (i) {
-                                    //each child looks like this
-                                    //<orgSetting minSupportedVersion="5.0.9688.583" name="ActivityConvertDlgCampaignUnchecked" min="null" max="null" defaultValue="true" settingType="Boolean" supportUrl="http://url" description="stuff" />
-                                    var curNode = o$(this)[0]; //current XML node 
-                                    var minVer = curNode.attributes.getNamedItem("minSupportedVersion").value;
-                                    var maxVer = curNode.attributes.getNamedItem("maxSupportedVersion").value;
-                                    if (serverBuildVersion.isGreaterThanOrEq(BuildVersion.parseBuildNumber(minVer)) && serverBuildVersion.isLessThanOrEq(BuildVersion.parseBuildNumber(maxVer))) {
-                                        baseOrgSettings.addSetting(new orgSetting(
-                                            curNode.attributes.getNamedItem("name").value,
-                                            null,
-                                            curNode.attributes.getNamedItem("settingType").value,
-                                            curNode.attributes.getNamedItem("min").value,
-                                            curNode.attributes.getNamedItem("max").value,
-                                            curNode.attributes.getNamedItem("defaultValue").value,
-                                            curNode.attributes.getNamedItem("supportUrl").value,
-                                            curNode.attributes.getNamedItem("description").value,
-                                            curNode.attributes.getNamedItem("minSupportedVersion").value,
-                                            curNode.attributes.getNamedItem("urlTitle").value),
-                                            curNode.attributes.getNamedItem("minSupportedVersion").value
-                                        );
-                                    }
-                                });
-                                //all default settings are now in baseOrgSettings 
-                                //now process the orgdborgsettings from the CRM Server and update the baseOrgSettings
-                                SDK.SOAP.getOrgDbOrgSettingsFromCRM(
-                                    success = function (results) {
+                enableProgressDiv(true);
+
+                //load the entire Organization entity 
+                SDK.SOAP.getOrganizationEntityFromCrm()
+                    .done(function (results, textStatus, XmlHttpRequest) {
+                        //Setup our global values from the results 
+                        SDK.Settings.CRMOrganizationResults = results.d.results[0];
+                        SDK.Settings.OrganizationId = SDK.Settings.CRMOrganizationResults.OrganizationId;
+                        SDK.SOAP.getCrmServerVersion(
+                            function (serverBuildVersion) {
+                                ///<param name='serverBuildVersion' type='BuildVersion'></param>
+                                //fire another 'thread' off to check solution and versions - then compare them
+                                getLatestCrmSolutionVersion(false);
+                                SDK.Settings.crmServerDBVersion = serverBuildVersion;
+                                //on success - print build version 
+                                o$('#ServerVersionDiv')
+                                    .html("<i>Server version (from about page): " + serverBuildVersion.toBuildNumberString() + "</i>")
+                                    .css('visibility', 'visible');
+                                //proceed to retrieving settings xml 
+                                SDK.SOAP.getSettingsXmlFromUrl("settings.xml")
+                                    .done(function (response, textStatus, XmlHttpRequest) {
+                                        var baseOrgSettings = new OrgSettingsCollection();
+                                        //success - parse XML into settings 
+                                        var xmlDoc = o$.parseXML(XmlHttpRequest.responseText);
+                                        o$(xmlDoc).find('defaultorgSettings').children().each(function (i) {
+                                            //each child looks like this
+                                            //<orgSetting minSupportedVersion="5.0.9688.583" name="ActivityConvertDlgCampaignUnchecked" min="null" max="null" defaultValue="true" settingType="Boolean" supportUrl="http://url" description="stuff" />
+                                            var curNode = o$(this)[0]; //current XML node 
+                                            var minVer = curNode.attributes.getNamedItem("minSupportedVersion").value;
+                                            var maxVer = curNode.attributes.getNamedItem("maxSupportedVersion").value;
+                                            if (serverBuildVersion.isGreaterThanOrEq(BuildVersion.parseBuildNumber(minVer)) && serverBuildVersion.isLessThanOrEq(BuildVersion.parseBuildNumber(maxVer))) {
+
+                                                var isOrganizationAttribute = false;
+                                                var currentSettingValue = null;
+
+                                                //check if it is an Organization Entity Attribute - if so, get the value as we already have it 
+                                                if (null != curNode.attributes.getNamedItem("isOrganizationAttribute")) {
+                                                    isOrganizationAttribute = parseValueFromTypeName("boolean", curNode.attributes.getNamedItem("isOrganizationAttribute").value);
+                                                    currentSettingValue = SDK.Settings.CRMOrganizationResults[curNode.attributes.getNamedItem("name").value];
+                                                }
+
+                                                baseOrgSettings.addSetting(
+                                                    new orgSetting(
+                                                        curNode.attributes.getNamedItem("name").value,
+                                                        currentSettingValue,
+                                                        curNode.attributes.getNamedItem("settingType").value,
+                                                        curNode.attributes.getNamedItem("min").value,
+                                                        curNode.attributes.getNamedItem("max").value,
+                                                        curNode.attributes.getNamedItem("defaultValue").value,
+                                                        curNode.attributes.getNamedItem("supportUrl").value,
+                                                        curNode.attributes.getNamedItem("description").value,
+                                                        minVer,
+                                                        curNode.attributes.getNamedItem("urlTitle").value,
+                                                        maxVer,
+                                                        isOrganizationAttribute
+                                                    )
+                                                );
+                                            }
+                                        });
+                                        //all default settings are now loaded - set them globally 
+                                        SDK.Settings.OrganizationSettings = baseOrgSettings;
+
                                         //parse XML document and loop through settings to populate the array with default values and types retrieved from the deafult data array
-                                        var xmlDoc = o$.parseXML(results.d.results[0].OrgDbOrgSettings);
+                                        var xmlDoc = o$.parseXML(SDK.Settings.CRMOrganizationResults.OrgDbOrgSettings);
                                         o$(xmlDoc).find('OrgSettings').children().each(function (index) {
                                             var settingName = o$(this)[0].tagName;
                                             var settingValue = o$(this)[0].text || o$(this)[0].textContent || "";
                                             //update the settign value if it exists in our default collection 
-                                            var settingObj = baseOrgSettings.getSetting(settingName);
+                                            var settingObj = SDK.Settings.OrganizationSettings.getSetting(settingName);
                                             if (settingObj) //if we have the setting in our collection
                                             {
                                                 try {
@@ -1164,36 +1217,24 @@
                                                     dumpErrorInBanner(new Error("Error setting: " + settingName + " with value: " + settingValue + " - " + e.message));
                                                 }
                                             }
-                                        });
-
-                                        //set our globals from here 
-                                        setJavascriptGlobals(baseOrgSettings, results.d.results[0].OrganizationId);
-
+                                        })
                                         printSettingsToDiv();
-
-                                        var DisableIECompatModeSetting = baseOrgSettings.getSetting("DisableIECompatMode");
-
-                                        if (!supportedBrowser || (DisableIECompatModeSetting && DisableIECompatModeSetting.value == false)) {
-                                            updateBanner("<b>This may not operate in compatability or a non standards mode</b>: For details please read <a href='" + SDK.Settings.projectIECompatDocUrl + "' target='_blank'>this FAQ</a>, manually check <a href='" + SDK.Settings.projectUrl + "' target='_blank'>here</a> for updates.", false, "IENotSupported");
-                                        }
-
-                                        //instruct user on how this works
-                                        updateBanner("Click a setting row for more details at the bottom of the page. NOTE: you should not change any setting without having a specific reason to do so.", false, "howtomessage");
-                                        enableProgressDiv(false); //done free up the UI 
-                                    },
-                                    errorOnGetOrgDbOrgSettings = function (error) {
-                                        dumpErrorInBanner(error);
-                                        enableProgressDiv(false); //we had an error free up the UI 
+                                        printUserInstructions();
+                                    })
+                                    .fail(function (jqXHR, textStatus, errorThrown) {
+                                        alert("There was an error retrieving the Organization Entity: " + errorThrown);
+                                        dumpErrorInBanner(errorThrown);
                                     });
                             },
-                            error = function (errorObject) {
-                                dumpErrorInBanner(errorObject);
-                                enableProgressDiv(false); //we had an error free up the UI 
-                            }
-                        );
-                    },
-                    function (errorMessage) {
-                        dumpErrorInBanner(errorMessage);
+                            function (errorMessage) {
+                                dumpErrorInBanner(errorMessage);
+                            });
+                    })
+                    .fail(function (jqXHR, textStatus, errorThrown) {
+                        alert("There was an error retrieving the Organization Entity: " + errorThrown);
+                    })
+                    .always(function (XMLHttpRequest, status) {
+                        enableProgressDiv(false);
                     });
             }
             catch (e) {
@@ -1204,6 +1245,14 @@
                     , true, "massiveerrormsg");
             }
         };
+        function printUserInstructions() {
+            var DisableIECompatModeSetting = SDK.Settings.OrganizationSettings.getSetting("DisableIECompatMode");
+            if (!supportedBrowser || (DisableIECompatModeSetting && DisableIECompatModeSetting.value == false)) {
+                updateBanner("<b>This may not operate in compatability or a non standards mode</b>: For details please read <a href='" + SDK.Settings.projectIECompatDocUrl + "' target='_blank'>this FAQ</a>, manually check <a href='" + SDK.Settings.projectUrl + "' target='_blank'>here</a> for updates.", false, "IENotSupported");
+            }
+            //instruct user on how this works
+            updateBanner("Click a setting row for more details at the bottom of the page. NOTE: you should not change any setting without having a specific reason to do so.", false, "howtomessage");
+        }
         function dumpErrorInBanner(e) {
             ///<param name='e' type='Error'></param>
             updateBanner("We've handled an error, for reference the error info is:" +