diff --git a/README.md b/README.md
index 531456e..b1b15fe 100644
--- a/README.md
+++ b/README.md
@@ -36,10 +36,10 @@ The template can be configured using the following options:
 1. To deploy this application, download the template from Portal/ArcGIS Online and unzip it.
 2. Copy the unzipped folder containing the web app template files, such as index.html, to your web server. You can rename the folder to change the URL through which users will access the application. By default the URL to the app will be `http://<Your Web Server>/<app folder name>/index.html`
 3. Change the sharing host, found in defaults.js inside the config folder for the application, to the sharing URL for ArcGIS Online or Portal. For ArcGIS Online users, keep the default value of www.arcgis.com or specify the name of your organization.
-  - ArcGIS Online Example:  `"sharinghost": location.protocol + "//" + “<your organization name>.maps.arcgis.com`
-  - Portal Example where `arcgis` is the name of the Web Adaptor: `"sharinghost": location.protocol + "//" + "webadaptor.domain.com/arcgis"`
-4. If you are using Portal or a local install of the ArcGIS API for JavaScript, change all references to the ArcGIS API for JavaScript in index.html to refer to your local copy of the API. Search for the references containing `"//js.arcgis.com/3.20"` and replace this portion of the reference with the url to your local install.
-  - For example: `"//webadaptor.domain.com/arcgis/jsapi/jsapi"` where `arcgis` is the name of your Web Adaptor.
+  - ArcGIS Online Example:  `"sharinghost": "https://" + “<your organization name>.maps.arcgis.com`
+  - Portal Example where `arcgis` is the name of the Web Adaptor: `"sharinghost": "https://" + "webadaptor.domain.com/arcgis"`
+4. If you are using Portal or a local install of the ArcGIS API for JavaScript, change all references to the ArcGIS API for JavaScript in index.html to refer to your local copy of the API. Search for the references containing `"https://js.arcgis.com/3.21"` and replace this portion of the reference with the url to your local install.
+  - For example: `"https://webadaptor.domain.com/arcgis/jsapi/jsapi"` where `arcgis` is the name of your Web Adaptor.
 5. Copy a map or group ID from Portal/ArcGIS Online and replace the default web map ID in the application’s index.html page. You can now run the application on your web server or customize the application further.
 
 > **Note:** If your application edits features in a feature service, contains secure services or web maps that aren't shared publicly, or generate requests that exceed 200 characters, you may need to set up and use a proxy page. Common situations where you may exceed the URL length are using complex polygons as input to a task or specifying a spatial reference using well-known text (WKT). For details on installing and configuring a proxy page see [Using the proxy](https://developers.arcgis.com/javascript/jshelp/ags_proxy.html). If you do not have an Internet connection, you will need to access and deploy the ArcGIS API for JavaScript documentation from [developers.arcgis.com](https://developers.arcgis.com/).
diff --git a/config/defaults.js b/config/defaults.js
index e271ded..28908c4 100755
--- a/config/defaults.js
+++ b/config/defaults.js
@@ -156,7 +156,7 @@ define({
     //Enter the url to your organizations bing maps key if you want to use bing basemaps
     "bingmapskey": "",
     //Defaults to arcgis.com. Set this value to your portal or organization host name.
-    "sharinghost": location.protocol + "//" + "www.arcgis.com",
+    "sharinghost": "https://www.arcgis.com",
     "units": null,
     "helperServices": {
         "geometry": {
diff --git a/css/browseDialog.css b/css/browseDialog.css
index 6d6c839..7c284f2 100644
--- a/css/browseDialog.css
+++ b/css/browseDialog.css
@@ -38,7 +38,7 @@
 .soria .ui-state-active {
     background-color: #fff;
 }
-.dgrid-row {
+#browse-id-box .dgrid-row {
     width: 125px;
     float: left;
     text-align: center;
@@ -46,38 +46,38 @@
     border: solid 1px #fff !important;
     margin: 2px;
 }
-.dgrid-scroller {
+#browse-id-box .dgrid-scroller {
     overflow-y: auto !important;
 }
-.dgrid-pagination-links:hover {
+#browse-id-box .dgrid-pagination-links:hover {
     cursor: pointer;
 }
-.dgrid-pagination .dgrid-page-disabled {
+#browse-id-box .dgrid-pagination .dgrid-page-disabled {
     color: hsl(0, 0%, 67%) !important;
     cursor: default;
 }
-.dgrid-page-link {
+#browse-id-box .dgrid-page-link {
     cursor: pointer;
 }
-.dgrid-active {
+#browse-id-box .dgrid-active {
     background-color: #fff;
 }
-.dgrid-selected {
+#browse-id-box .dgrid-selected {
     border-radius: 4px;
     background-color: #fff;
     border: solid 1px #BFD6EB !important;
 }
-.dgrid-row .dgrid-row-odd {
+#browse-id-box .dgrid-row .dgrid-row-odd {
     background-color: #fff;
 }
-.dgrid-row .dgrid-row-even {
+#browse-id-box .dgrid-row .dgrid-row-even {
     background-color: #fff;
 }
-.dgrid-row:hover {
+#browse-id-box .dgrid-row:hover {
     border-radius: 4px;
     background-color: #E1F0FB !important;
 }
-;
+
  .truncate {
     white-space: nowrap;
     overflow: hidden;
diff --git a/dataBrowser.html b/dataBrowser.html
index bd1125f..4b7b9e1 100644
--- a/dataBrowser.html
+++ b/dataBrowser.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
     <title>Data Browser</title>
     <style>
         html, body
@@ -21,8 +20,8 @@
     </style>
 </head>
 <body class="claro">
-    <link rel="stylesheet" href="http://js.arcgis.com/3.20/dijit/themes/claro/claro.css" />
-    <link rel="stylesheet" href="http://js.arcgis.com/3.20/esri/css/esri.css" />
+    <link rel="stylesheet" href="http://js.arcgis.com/3.21/dijit/themes/claro/claro.css" />
+    <link rel="stylesheet" href="http://js.arcgis.com/3.21/esri/css/esri.css" />
     <script type="text/javascript">
         var package_path = window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/'));
         var dojoConfig = {
@@ -39,7 +38,7 @@
           dojoConfig.locale = RegExp.$1;
         }
     </script>
-    <script src="//js.arcgis.com/3.20"></script>
+    <script src="https://js.arcgis.com/3.21"></script>
     <script type="text/javascript">
         var dataBrowser;
         require([
diff --git a/index.html b/index.html
index f461013..e7ed7ec 100755
--- a/index.html
+++ b/index.html
@@ -4,8 +4,6 @@
     <title>Impact Summary Map</title>
     <meta name="fragment" content="!">
     <meta charset="utf-8" />
-    <!--Define the versions of IE that will be used to render the page. See Microsoft documentation for details. Optional.-->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <!-- Responsive -->
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <meta name="mobile-web-app-capable" content="yes">
@@ -23,10 +21,11 @@
     <meta property="og:image" content="images/item.png" />
     <meta property="og:site_name" content="esri" />
     <!-- End Facebook -->
-    <!--Use protocol relative urls that way if the browser is viewing the page via HTTPS the js/css file will be requested using the HTTPS protocol-->
-    <link rel="stylesheet" type="text/css" href="//js.arcgis.com/3.20/esri/css/esri.css">
-    <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Lato:300,400,700" />
+    <link rel="stylesheet" type="text/css" href="https://js.arcgis.com/3.21/esri/css/esri.css">
+    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Lato:300,400,700" />
     <!--Load any application specific styles-->
+    <link rel="stylesheet" href="https://js.arcgis.com/3.21/dgrid/css/dgrid.css">
+    <link rel="stylesheet" href="https://js.arcgis.com/3.21/dgrid/css/skins/claro.css">
     <link id="claroTheme" rel="stylesheet" type="text/css" />
     <link rel="stylesheet" type="text/css" href="css/dijit.css" />
     <link rel="stylesheet" type="text/css" href="css/fontello.css" />
@@ -111,7 +110,7 @@
           dojoConfig.locale = RegExp.$1;
         }
     </script>
-    <script type="text/javascript" src="//js.arcgis.com/3.20"></script>
+    <script type="text/javascript" src="https://js.arcgis.com/3.21"></script>
     <script type="text/javascript">
         require([
             "config/templateConfig",
diff --git a/js/ShareDialog.js b/js/ShareDialog.js
index bd65956..1a0ceb1 100644
--- a/js/ShareDialog.js
+++ b/js/ShareDialog.js
@@ -259,7 +259,7 @@ define([
                     urlObject.query.extent = null;
                 }
                 // create base url
-                url = window.location.protocol + '//' + window.location.host + window.location.pathname;
+                url = 'https://' + window.location.host + window.location.pathname;
                 // each param
                 for (var i in urlObject.query) {
                     if (urlObject.query[i]) {
diff --git a/js/TemplateBuilder.js b/js/TemplateBuilder.js
index c55b3f6..5f887ca 100644
--- a/js/TemplateBuilder.js
+++ b/js/TemplateBuilder.js
@@ -28,14 +28,15 @@ define([
     "application/BrowseIdDlg",
     "application/EnrichLayer",
     "esri/basemaps",
-    "esri/arcgis/utils"
+    "esri/arcgis/utils",
+    "esri/dijit/AppProxySettings"
 ],
 function (
     declare,
     lang,
     _WidgetBase,
     ContentPane,
-    dom, on, number, string, query, array, domConstruct, domClass, Dialog, esriRequest, domAttr, domStyle, nls, topic, keys, Editor, TooltipDialog, popup, aspect, FullScreen, LinkDialog, ViewSource, BrowseIdDlg, EnrichLayer, esriBasemaps, arcgisUtils) {
+    dom, on, number, string, query, array, domConstruct, domClass, Dialog, esriRequest, domAttr, domStyle, nls, topic, keys, Editor, TooltipDialog, popup, aspect, FullScreen, LinkDialog, ViewSource, BrowseIdDlg, EnrichLayer, esriBasemaps, arcgisUtils, AppProxySettings) {
     var Widget = declare([_WidgetBase], {
         declaredClass: "application.TemplateBuilder",
         //URL for updating Item
@@ -97,7 +98,7 @@ function (
         _loadCSS: function () {
             //Load claro css
             if (dom.byId("claroTheme")) {
-                domAttr.set(dom.byId("claroTheme"), "href", location.protocol + "//js.arcgis.com/3.20/dijit/themes/claro/claro.css");
+                domAttr.set(dom.byId("claroTheme"), "href", "https://js.arcgis.com/3.21/dijit/themes/claro/claro.css");
             }
             domClass.add(document.body, "claro");
             //Load browser dialog
@@ -109,11 +110,12 @@ function (
         },
 
         _showBuilderMode: function (builderNode) {
-            var buttonContainer, dataConfigurationButton, appSettingConfigurationButton, previewModeButton, saveButtonContainer,
+            var buttonContainer, dataConfigurationButton, appSettingConfigurationButton, previewModeButton, saveButtonContainer, appProxiesButton,
             applicationSettingSaveButton, unsavedChangesText, browseParams;
             buttonContainer = domConstruct.create("div", { "class": "esriButtonContainer" }, builderNode);
             dataConfigurationButton = domConstruct.create("button", { innerHTML: nls.widgets.TemplateBuilder.dataConfigurationButtonText, "class": "esriButton" }, buttonContainer);
             appSettingConfigurationButton = domConstruct.create("button", { "style": "margin-left:10px;", "class": "esriButton", innerHTML: nls.widgets.TemplateBuilder.applicationSettingText }, buttonContainer);
+            appProxiesButton = domConstruct.create("button", { "style": "margin-left:10px;", "class": "esriButton", innerHTML: nls.widgets.TemplateBuilder.appProxiesText }, buttonContainer);
             previewModeButton = domConstruct.create("button", { "style": "margin-left:10px;", "class": "esriButton", innerHTML: nls.widgets.TemplateBuilder.exitBuilderButtonText }, buttonContainer);
             saveButtonContainer = domConstruct.create("div", { "class": "esriSaveButtonContainer" }, builderNode);
             applicationSettingSaveButton = domConstruct.create("button", { innerHTML: nls.widgets.TemplateBuilder.saveButtonText, "class": "esriButton esriSaveButton" }, saveButtonContainer);
@@ -131,6 +133,10 @@ function (
             this._createConfigurationPanel(true);
           }
 
+          on(appProxiesButton, "click", lang.hitch(this, function () {
+                this._createAppProxiesPanel();
+            }));
+
             on(appSettingConfigurationButton, "click", lang.hitch(this, function () {
                 this._createAppSettingsPanel();
             }));
@@ -191,6 +197,36 @@ function (
             }
         },
 
+        _createAppProxiesPanel: function(){
+            if (!this._proxiesDialog) {
+                var proxiesContainer;
+                proxiesContainer = domConstruct.create("div", { "class": "esriAppSettingPanelContainer claro","style": { "width":"500px", "height": "400px"} }, null);
+
+                domConstruct.create("p", {innerHTML: nls.widgets.TemplateBuilder.appProxiesDesc}, proxiesContainer);
+
+                var appProxyWidget = new AppProxySettings({
+                    proxyManagerOptions: {
+                        appid: this.config.appid
+                    },
+                    webmaps: [this.config.webmap]
+                }, domConstruct.create("div", {
+                    id: "appProxyWidget"
+                }));
+                appProxyWidget.startup();
+                domConstruct.place(appProxyWidget.domNode, proxiesContainer);
+
+                //create dialog and show entire application settings
+                this._proxiesDialog = new Dialog({
+                    title: nls.widgets.TemplateBuilder.appProxiesText,
+                    "class": "esriDijitDialog",
+                    draggable: false
+                });
+                this._proxiesDialog.setContent(proxiesContainer);
+            }
+            
+            this._proxiesDialog.show();
+        },
+
         /* This section creates Application setting dialog which will be used to configureentire application at one go */
         //function to create Application settigns panel
         //function creates Left,Right,Basemap and Bottom panel
diff --git a/js/main.js b/js/main.js
index ba759d6..e3a9e47 100755
--- a/js/main.js
+++ b/js/main.js
@@ -537,6 +537,7 @@ function (
                 },
                 editable: false,
                 usePopupManager: true,
+                layerMixins: this.config.layerMixins || [],
                 bingMapsKey: this.config.bingmapskey
             }).then(lang.hitch(this, function (response) {
                 //Once the map is created we get access to the response which provides important info
diff --git a/js/nls/TemplateBuilder.js b/js/nls/TemplateBuilder.js
index 0c0ce8b..4acbb2b 100644
--- a/js/nls/TemplateBuilder.js
+++ b/js/nls/TemplateBuilder.js
@@ -16,6 +16,8 @@ define({
                 "layerLabelText": "Layer",
                 "noLayerFoundText": "No Layer Found",
                 "selectLayer": "Select Layer",
+                "appProxiesText": "Subscriber Access",
+                "appProxiesDesc": "To allow public access via your subscription, check the appropriate boxes. Content marked as Premium Content will consume credits from your subscription.",
                 "applicationSettingText": "Application Settings",
                 "summaryAttrAscendingOrderTooltip": "Ascending",
                 "onStartLabel": "On Start",
diff --git a/js/nls/ar/TemplateBuilder.js b/js/nls/ar/TemplateBuilder.js
index d3153e4..5c54d95 100644
--- a/js/nls/ar/TemplateBuilder.js
+++ b/js/nls/ar/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "الطبقة",
       "noLayerFoundText": "لم يتم إيجاد الطبقة",
       "selectLayer": "تحديد الطبقة",
+      "appProxiesText": "وصول المشترك",
+      "appProxiesDesc": "للسماح بالوصول العام عن طريق الاشتراك الخاص بك، قم بالتأشير على الخانات المناسبة. سوف يستهلك المحتوى ذات علامة محتوى مميز اعتمادات من الاشتراك الخاص بك.",
       "applicationSettingText": "إعدادات التطبيق",
       "summaryAttrAscendingOrderTooltip": "تصاعدي",
       "onStartLabel": "عند البدء",
diff --git a/js/nls/bs/TemplateBuilder.js b/js/nls/bs/TemplateBuilder.js
index f85f5c1..d48efca 100644
--- a/js/nls/bs/TemplateBuilder.js
+++ b/js/nls/bs/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Sloj",
       "noLayerFoundText": "Sloj nije pronađen",
       "selectLayer": "Odabir sloja",
+      "appProxiesText": "Pretplatnički pristup",
+      "appProxiesDesc": "Za omogućivanje javnog pristupa putem vaše pretplate Označite odgovarajuće okvire. Sadržaj koji je označen kao premium trošit će kredite iz vaše pretplate.",
       "applicationSettingText": "Postavke aplikacije",
       "summaryAttrAscendingOrderTooltip": "Uzlazno",
       "onStartLabel": "Na početku",
diff --git a/js/nls/cs/TemplateBuilder.js b/js/nls/cs/TemplateBuilder.js
index 36d6dcb..d1b6626 100644
--- a/js/nls/cs/TemplateBuilder.js
+++ b/js/nls/cs/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Vrstva",
       "noLayerFoundText": "Nebyla nalezena žádná vrstva",
       "selectLayer": "Vybrat vrstvu",
+      "appProxiesText": "Přístup pro předplatitele",
+      "appProxiesDesc": "Chcete-li povolit veřejný přístup prostřednictvím předplatného, zaškrtněte příslušná políčka. Obsah označený jako Prémiový obsah bude z vašeho předplatného čerpat kredity.",
       "applicationSettingText": "Nastavení aplikace",
       "summaryAttrAscendingOrderTooltip": "Vzestupně",
       "onStartLabel": "Při spuštění",
diff --git a/js/nls/da/TemplateBuilder.js b/js/nls/da/TemplateBuilder.js
index d0678fb..8d26328 100644
--- a/js/nls/da/TemplateBuilder.js
+++ b/js/nls/da/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Lag",
       "noLayerFoundText": "Ingen lag fundet",
       "selectLayer": "Vælg lag",
+      "appProxiesText": "Abonnentadgang",
+      "appProxiesDesc": "Hvis du vil tillade offentlig adgang via dit abonnement, skal du markere de relevante felter. Indhold, der er markeret som Premium-indhold, vil forbruge credits fra dit abonnement.",
       "applicationSettingText": "Applikationsindstillinger",
       "summaryAttrAscendingOrderTooltip": "Stigende",
       "onStartLabel": "Ved start",
diff --git a/js/nls/de/TemplateBuilder.js b/js/nls/de/TemplateBuilder.js
index dcbfce3..fd8575b 100644
--- a/js/nls/de/TemplateBuilder.js
+++ b/js/nls/de/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Layer",
       "noLayerFoundText": "Kein Layer gefunden",
       "selectLayer": "Layer auswählen",
+      "appProxiesText": "Abonnentenzugriff",
+      "appProxiesDesc": "Aktivieren Sie die entsprechenden Kontrollkästchen, um den Zugang der Öffentlichkeit über Ihre Subskription zuzulassen. Bei Inhalten, die als Premium-Inhalte gekennzeichnet sind, werden Credits von Ihrer Subskription verbraucht.",
       "applicationSettingText": "Anwendungseinstellungen",
       "summaryAttrAscendingOrderTooltip": "Aufsteigend",
       "onStartLabel": "Beim Start",
diff --git a/js/nls/el/TemplateBuilder.js b/js/nls/el/TemplateBuilder.js
index 8958141..20e23fb 100644
--- a/js/nls/el/TemplateBuilder.js
+++ b/js/nls/el/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Θεματικό επίπεδο",
       "noLayerFoundText": "Δεν βρέθηκε θεματικό επίπεδο",
       "selectLayer": "Επιλογή θεματικού επιπέδου",
+      "appProxiesText": "Πρόσβαση συνδρομητή",
+      "appProxiesDesc": "Για να επιτρέπεται η δημόσια πρόσβαση μέσω της συνδρομής σας, επιλέξτε τα κατάλληλα πλαίσια. Το περιεχόμενο με την ένδειξη Premium Content θα καταναλώνει μονάδες από τη συνδρομή σας.",
       "applicationSettingText": "Ρυθμίσεις εφαρμογής",
       "summaryAttrAscendingOrderTooltip": "Αύξουσα",
       "onStartLabel": "Κατά την εκκίνηση",
diff --git a/js/nls/es/TemplateBuilder.js b/js/nls/es/TemplateBuilder.js
index ab19fff..f2475ca 100644
--- a/js/nls/es/TemplateBuilder.js
+++ b/js/nls/es/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Capa",
       "noLayerFoundText": "No se ha encontrado ninguna capa",
       "selectLayer": "Seleccionar capa",
+      "appProxiesText": "Acceso de suscriptor",
+      "appProxiesDesc": "Para permitir el acceso público a través de su suscripción, active las casillas adecuadas. El contenido marcado como Premium consumirá créditos de su suscripción.",
       "applicationSettingText": "Configuración de la aplicación",
       "summaryAttrAscendingOrderTooltip": "Ascendente",
       "onStartLabel": "En el inicio",
diff --git a/js/nls/et/TemplateBuilder.js b/js/nls/et/TemplateBuilder.js
index 0dce4ed..e2cc8cb 100644
--- a/js/nls/et/TemplateBuilder.js
+++ b/js/nls/et/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Kiht",
       "noLayerFoundText": "Kihti ei leitud",
       "selectLayer": "Vali kiht",
+      "appProxiesText": "Tellija juurdepääs",
+      "appProxiesDesc": "Teie tellimuse kaudu avaliku ligipääsu lubamiseks märkige vastavad märkeruudud. Kvaliteetsisu kasutab krediite teie tellimusest.",
       "applicationSettingText": "Rakenduse seaded",
       "summaryAttrAscendingOrderTooltip": "Kasvav",
       "onStartLabel": "Käivitamisel",
diff --git a/js/nls/fi/TemplateBuilder.js b/js/nls/fi/TemplateBuilder.js
index 4ba2f10..4606c72 100644
--- a/js/nls/fi/TemplateBuilder.js
+++ b/js/nls/fi/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Karttataso",
       "noLayerFoundText": "Yhtään karttatasoa ei löytynyt",
       "selectLayer": "Valitse karttataso",
+      "appProxiesText": "Tilaajakäyttöoikeus",
+      "appProxiesDesc": "Jos haluat sallia julkisen käytön tilauksesi kautta, valitse asianmukaiset valintaruudut. Sisältö, joka on merkitty Premium-sisällöksi, kuluttaa tilauksesi krediittejä.",
       "applicationSettingText": "Sovelluksen asetukset",
       "summaryAttrAscendingOrderTooltip": "Nouseva",
       "onStartLabel": "Aloituksessa",
diff --git a/js/nls/fr/TemplateBuilder.js b/js/nls/fr/TemplateBuilder.js
index 909953e..5a61e65 100644
--- a/js/nls/fr/TemplateBuilder.js
+++ b/js/nls/fr/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Couche",
       "noLayerFoundText": "Aucune couche trouvée",
       "selectLayer": "Sélectionner une couche",
+      "appProxiesText": "Accès abonné",
+      "appProxiesDesc": "Pour autoriser l'accès public via votre abonnement, cochez les cases appropriées. Le contenu marqué Contenu premium consomme des crédits de votre abonnement.",
       "applicationSettingText": "Paramètres de l'application",
       "summaryAttrAscendingOrderTooltip": "Croissant",
       "onStartLabel": "Au démarrage",
diff --git a/js/nls/he/TemplateBuilder.js b/js/nls/he/TemplateBuilder.js
index aa2b64b..bfe3216 100644
--- a/js/nls/he/TemplateBuilder.js
+++ b/js/nls/he/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "שכבה",
       "noLayerFoundText": "לא נמצאה שכבה",
       "selectLayer": "בחר שכבה",
+      "appProxiesText": "גישת מנוי",
+      "appProxiesDesc": "כדי לאפשר גישה ציבורית דרך המנוי שלך, סמן את התיבות המתאימות. תוכן שמסומן כ'תוכן פרימיום' יצרוך קרדיט מהמנוי שלך.",
       "applicationSettingText": "הגדרות אפליקציה",
       "summaryAttrAscendingOrderTooltip": "עולה",
       "onStartLabel": "בהתחלה",
diff --git a/js/nls/hi/TemplateBuilder.js b/js/nls/hi/TemplateBuilder.js
index fb4d50f..2110b23 100644
--- a/js/nls/hi/TemplateBuilder.js
+++ b/js/nls/hi/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "लेयर",
       "noLayerFoundText": "कोई लेयर नहीं मिली",
       "selectLayer": "लेयर चुनें",
+      "appProxiesText": "सदस्य एक्सेस",
+      "appProxiesDesc": "अपनी सदस्यता के ज़रिए सार्वजनिक एक्सेस की अनुमति देने के लिए उचित बॉक्स चुनें। ऐसी सामग्री जो प्रीमियम सामग्री के रूप में चिन्हित है वह आपकी सदस्यता से ज़्यादा क्रेडिट खर्च करेगी।",
       "applicationSettingText": "ऐप्लीकेशन सेटिंग",
       "summaryAttrAscendingOrderTooltip": "आरोही",
       "onStartLabel": "प्रारंभ पर",
diff --git a/js/nls/hr/TemplateBuilder.js b/js/nls/hr/TemplateBuilder.js
index f85f5c1..d48efca 100644
--- a/js/nls/hr/TemplateBuilder.js
+++ b/js/nls/hr/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Sloj",
       "noLayerFoundText": "Sloj nije pronađen",
       "selectLayer": "Odabir sloja",
+      "appProxiesText": "Pretplatnički pristup",
+      "appProxiesDesc": "Za omogućivanje javnog pristupa putem vaše pretplate Označite odgovarajuće okvire. Sadržaj koji je označen kao premium trošit će kredite iz vaše pretplate.",
       "applicationSettingText": "Postavke aplikacije",
       "summaryAttrAscendingOrderTooltip": "Uzlazno",
       "onStartLabel": "Na početku",
diff --git a/js/nls/id/TemplateBuilder.js b/js/nls/id/TemplateBuilder.js
index 651d0e1..771a286 100644
--- a/js/nls/id/TemplateBuilder.js
+++ b/js/nls/id/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Lapisan",
       "noLayerFoundText": "Tidak Ditemukan Lapisan",
       "selectLayer": "Pilih Lapisan",
+      "appProxiesText": "Akses Pelanggan",
+      "appProxiesDesc": "Untuk mengizinkan akses publik melalui langganan Anda, centang kotak yang sesuai. Konten yang ditandai sebagai Konten Premium akan mengurangi kredit dari langganan Anda.",
       "applicationSettingText": "Pengaturan Aplikasi",
       "summaryAttrAscendingOrderTooltip": "Naik",
       "onStartLabel": "Saat Mulai",
diff --git a/js/nls/it/TemplateBuilder.js b/js/nls/it/TemplateBuilder.js
index fcb91f9..5708f43 100644
--- a/js/nls/it/TemplateBuilder.js
+++ b/js/nls/it/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Layer",
       "noLayerFoundText": "Layer non trovato",
       "selectLayer": "Seleziona layer",
+      "appProxiesText": "Accesso abbonati",
+      "appProxiesDesc": "Per consentire l'accesso pubblico mediante l'abbonamento, controllare le corrispondenti caselle. Il contenuto contrassegnato come Premium consumerà crediti dall'abbonamento.",
       "applicationSettingText": "Impostazioni applicazione",
       "summaryAttrAscendingOrderTooltip": "Crescente",
       "onStartLabel": "All'avvio",
diff --git a/js/nls/ja/TemplateBuilder.js b/js/nls/ja/TemplateBuilder.js
index 4d55932..b3658dd 100644
--- a/js/nls/ja/TemplateBuilder.js
+++ b/js/nls/ja/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "レイヤ",
       "noLayerFoundText": "レイヤが見つかりません",
       "selectLayer": "レイヤの選択",
+      "appProxiesText": "サブスクリプション アクセス",
+      "appProxiesDesc": "サブスクリプションを使用してパブリック アクセスを許可するには、該当するチェックボックスをオンにします。 プレミアム コンテンツのマークが付いたコンテンツは、サブスクリプションからクレジットが消費されます。",
       "applicationSettingText": "アプリケーション設定",
       "summaryAttrAscendingOrderTooltip": "昇順",
       "onStartLabel": "開始時",
diff --git a/js/nls/ko/TemplateBuilder.js b/js/nls/ko/TemplateBuilder.js
index 22862f0..e33306e 100644
--- a/js/nls/ko/TemplateBuilder.js
+++ b/js/nls/ko/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "레이어",
       "noLayerFoundText": "레이어가 없음",
       "selectLayer": "레이어 선택",
+      "appProxiesText": "구독자 접근",
+      "appProxiesDesc": "구독을 통한 공개 접근을 허용하려면 해당 체크 박스를 선택하세요. 프리미엄 콘텐츠로 표시된 콘텐츠의 경우 구독의 크레딧을 소모합니다.",
       "applicationSettingText": "응용프로그램 설정",
       "summaryAttrAscendingOrderTooltip": "오름차순",
       "onStartLabel": "시작 시",
diff --git a/js/nls/lt/TemplateBuilder.js b/js/nls/lt/TemplateBuilder.js
index 3d98a04..f0b6f54 100644
--- a/js/nls/lt/TemplateBuilder.js
+++ b/js/nls/lt/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Sluoksnis",
       "noLayerFoundText": "Sluoksnių nerasta",
       "selectLayer": "Pasirinkti sluoksnį",
+      "appProxiesText": "Prenumeratoriaus prieiga",
+      "appProxiesDesc": "Norėdami leisti viešąją prieigą per prenumeratą, pažymėkite atitinkamus laukelius. Turinys pažymėtas kaip „Premium“ naudos jūsų prenumeratos kreditus.",
       "applicationSettingText": "Aplikacijos nustatymai",
       "summaryAttrAscendingOrderTooltip": "Didėjimo tvarka",
       "onStartLabel": "Pradedant",
diff --git a/js/nls/lv/TemplateBuilder.js b/js/nls/lv/TemplateBuilder.js
index d4bac98..caef58c 100644
--- a/js/nls/lv/TemplateBuilder.js
+++ b/js/nls/lv/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Slānis",
       "noLayerFoundText": "Nav atrasts neviens slānis",
       "selectLayer": "Atlasīt slāni",
+      "appProxiesText": "Abonenta piekļuve",
+      "appProxiesDesc": "Lai atļautu publisku piekļuvi, izmantojot savu abonementu, atzīmējiet atbilstošās izvēles rūtiņas. Saturs, kas atzīmēts kā augstākās klases saturs, tērēs jūsu abonementa kredītpunktus.",
       "applicationSettingText": "Aplikācijas iestatījumi",
       "summaryAttrAscendingOrderTooltip": "Pieaugošs",
       "onStartLabel": "Sākot",
diff --git a/js/nls/nb/TemplateBuilder.js b/js/nls/nb/TemplateBuilder.js
index 01a29db..d4bd323 100644
--- a/js/nls/nb/TemplateBuilder.js
+++ b/js/nls/nb/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Lag",
       "noLayerFoundText": "Fant ingen lag",
       "selectLayer": "Velg lag",
+      "appProxiesText": "Abonnettilgang",
+      "appProxiesDesc": "Hvis du vil tillate offentlig tilgang via abonnementet ditt, merker du av i de aktuelle boksene. Innhold som er merket som premiuminnhold, bruker credits fra abonnementet.",
       "applicationSettingText": "Applikasjonsinnstillinger",
       "summaryAttrAscendingOrderTooltip": "Stigende",
       "onStartLabel": "Ved start",
diff --git a/js/nls/nl/TemplateBuilder.js b/js/nls/nl/TemplateBuilder.js
index 7157a3b..bc0ca9b 100644
--- a/js/nls/nl/TemplateBuilder.js
+++ b/js/nls/nl/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Kaartlaag",
       "noLayerFoundText": "Geen kaartlaag gevonden",
       "selectLayer": "Kaartlaag selecteren",
+      "appProxiesText": "Toegang voor abonnees",
+      "appProxiesDesc": "Om openbare toegang mogelijk te maken via uw abonnement, vink de gepaste vakjes aan. Content die gemarkeerd is als Premium Content zal credits van uw abonnement verbruiken.",
       "applicationSettingText": "Applicatie-instellingen",
       "summaryAttrAscendingOrderTooltip": "Oplopend",
       "onStartLabel": "Bij opstarten",
diff --git a/js/nls/pl/TemplateBuilder.js b/js/nls/pl/TemplateBuilder.js
index b85c197..537019f 100644
--- a/js/nls/pl/TemplateBuilder.js
+++ b/js/nls/pl/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Warstwa",
       "noLayerFoundText": "Nie znaleziono żadnych warstw",
       "selectLayer": "Wybierz warstwę",
+      "appProxiesText": "Dostęp dla subskrybentów",
+      "appProxiesDesc": "Aby zezwolić na dostęp publiczny za pośrednictwem subskrypcji, zaznacz odpowiednie pola. Zasoby oznaczone jako Zasoby Premium będą zużywać kredyty w ramach subskrypcji.",
       "applicationSettingText": "Ustawienia aplikacji",
       "summaryAttrAscendingOrderTooltip": "Rosnąco",
       "onStartLabel": "Na ekranie początkowym",
diff --git a/js/nls/pt-br/TemplateBuilder.js b/js/nls/pt-br/TemplateBuilder.js
index f553990..ed9c8ee 100644
--- a/js/nls/pt-br/TemplateBuilder.js
+++ b/js/nls/pt-br/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Camada",
       "noLayerFoundText": "Nenhuma Camada Localizada",
       "selectLayer": "Selecionar Camada",
+      "appProxiesText": "Acesso do Assinante",
+      "appProxiesDesc": "Para permitir acesso público via sua assinatura, selecione as caixas apropriadas. O conteúdo marcado como Conteúdo Premium consumirá créditos de sua assinatura.",
       "applicationSettingText": "Configurações do Aplicativo",
       "summaryAttrAscendingOrderTooltip": "Crescente",
       "onStartLabel": "Ao Iniciar",
diff --git a/js/nls/pt-pt/TemplateBuilder.js b/js/nls/pt-pt/TemplateBuilder.js
index 2773bd6..ff2d5b9 100644
--- a/js/nls/pt-pt/TemplateBuilder.js
+++ b/js/nls/pt-pt/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Camada",
       "noLayerFoundText": "Camada Não Encontrada",
       "selectLayer": "Escolher Camada",
+      "appProxiesText": "Acesso de Subscritor",
+      "appProxiesDesc": "Para permitir acesso público através da sua subscrição, marque as caixas apropriadas. Conteúdo assinalado como Conteúdo Premium irá consumir créditos da sua subscrição.",
       "applicationSettingText": "Definições da Aplicação",
       "summaryAttrAscendingOrderTooltip": "Ascendente",
       "onStartLabel": "Na Inicialização",
diff --git a/js/nls/ro/TemplateBuilder.js b/js/nls/ro/TemplateBuilder.js
index a7caf27..b305681 100644
--- a/js/nls/ro/TemplateBuilder.js
+++ b/js/nls/ro/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Strat tematic",
       "noLayerFoundText": "Niciun strat tematic găsit",
       "selectLayer": "Selectare strat tematic",
+      "appProxiesText": "Acces abonat",
+      "appProxiesDesc": "Pentru a permite accesul prin intermediul abonamentului dvs., bifaţi casetele corespunzătoare. Conţinutul marcat drept Conţinut premium va consuma credite din abonamentul dvs.",
       "applicationSettingText": "Setări aplicaţie",
       "summaryAttrAscendingOrderTooltip": "Ascendent",
       "onStartLabel": "La pornire",
diff --git a/js/nls/ru/TemplateBuilder.js b/js/nls/ru/TemplateBuilder.js
index c3d63f1..b5cdd1a 100644
--- a/js/nls/ru/TemplateBuilder.js
+++ b/js/nls/ru/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Слой",
       "noLayerFoundText": "Слой не найден",
       "selectLayer": "Выбрать слой",
+      "appProxiesText": "Доступ подписчика",
+      "appProxiesDesc": "Для разрешения общего доступа через вашу подписку отметьте соответствующие опции. Ресурс, отмеченный как Премиум, будет потреблять кредиты из вашей подписки.",
       "applicationSettingText": "Настройки приложения",
       "summaryAttrAscendingOrderTooltip": "По возрастанию",
       "onStartLabel": "В начале",
diff --git a/js/nls/sr/TemplateBuilder.js b/js/nls/sr/TemplateBuilder.js
index 5d5b3f2..483f951 100644
--- a/js/nls/sr/TemplateBuilder.js
+++ b/js/nls/sr/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Sloj",
       "noLayerFoundText": "Nijedan sloj nije pronađen",
       "selectLayer": "Izaberite sloj",
+      "appProxiesText": "Pretplatnički pristup",
+      "appProxiesDesc": "Kako biste omogućili javni pristup putem vaše pretplate, potvrdite odgovarajuća polja za potvrdu. Sadržaj označen kao Premijum sadržaj će oduzimati kredite sa vaše pretplate.",
       "applicationSettingText": "Postavke aplikacije",
       "summaryAttrAscendingOrderTooltip": "Rastuće",
       "onStartLabel": "Na početak",
diff --git a/js/nls/sv/TemplateBuilder.js b/js/nls/sv/TemplateBuilder.js
index 9fe4dfa..070343b 100644
--- a/js/nls/sv/TemplateBuilder.js
+++ b/js/nls/sv/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Lager",
       "noLayerFoundText": "Inget lager hittades",
       "selectLayer": "Välj lager",
+      "appProxiesText": "Åtkomst för abonnenter",
+      "appProxiesDesc": "Om du vill tillåta allmän åtkomst via ditt abonnemang markerar du rätt rutor. Innehåll som är märkt som premiuminnehåll förbrukar krediter från ditt abonnemang.",
       "applicationSettingText": "Programinställningar",
       "summaryAttrAscendingOrderTooltip": "Stigande",
       "onStartLabel": "Vid start",
diff --git a/js/nls/th/TemplateBuilder.js b/js/nls/th/TemplateBuilder.js
index 90cae4f..1a70c30 100644
--- a/js/nls/th/TemplateBuilder.js
+++ b/js/nls/th/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "ชั้นข้อมูล",
       "noLayerFoundText": "ไม่พบชั้นข้อมูล",
       "selectLayer": "เลือกชั้นข้อมูล",
+      "appProxiesText": "การเข้าถึงของสมาชิก",
+      "appProxiesDesc": "หากต้องการอนุญาตการเข้าถึงแบบสาธารณะผ่านการสมัครรับข้อมูลของคุณให้ทำเครื่องหมายในช่องที่เหมาะสม เนื้อหาที่ทำเครื่องหมายว่าเป็นเนื้อหาพรีเมียมจะใช้เครดิตจากการสมัครรับข้อมูลของคุณ",
       "applicationSettingText": "ตั้งค่าโปรแกรมประยุกต์",
       "summaryAttrAscendingOrderTooltip": "เรียงจากน้อยไปมาก",
       "onStartLabel": "เริ่มต้น",
diff --git a/js/nls/tr/TemplateBuilder.js b/js/nls/tr/TemplateBuilder.js
index 7785c85..a34b0ec 100644
--- a/js/nls/tr/TemplateBuilder.js
+++ b/js/nls/tr/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Katman",
       "noLayerFoundText": "Katman Bulunamadı",
       "selectLayer": "Katman seç",
+      "appProxiesText": "Abone Erişimi",
+      "appProxiesDesc": "Aboneliğiniz üzerinden genel erişim sağlamak için uygun kutuları işaretleyin. Ayrıcalıklı İçerik olarak işaretlenen içerik abonelik kredilerinizden kullanır.",
       "applicationSettingText": "Uygulama Ayarları",
       "summaryAttrAscendingOrderTooltip": "Artan",
       "onStartLabel": "Başlangıçta",
diff --git a/js/nls/vi/TemplateBuilder.js b/js/nls/vi/TemplateBuilder.js
index 5b400a7..242c625 100644
--- a/js/nls/vi/TemplateBuilder.js
+++ b/js/nls/vi/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "Lớp",
       "noLayerFoundText": "Không tìm thấy Lớp nào",
       "selectLayer": "Chọn Lớp",
+      "appProxiesText": "Truy cập người đăng ký",
+      "appProxiesDesc": "Để cho phép truy cập công cộng thông qua gói đăng ký của bạn, đánh dấu chọn vào ô thích hợp. Nội dung được đánh dấu là Nội dung cao cấp sẽ sử dụng tín dụng từ gói đăng ký của bạn.",
       "applicationSettingText": "Thiết lập ứng dụng",
       "summaryAttrAscendingOrderTooltip": "Tăng dần",
       "onStartLabel": "Bắt đầu",
diff --git a/js/nls/zh-cn/TemplateBuilder.js b/js/nls/zh-cn/TemplateBuilder.js
index cf4f7dc..f96a6f2 100644
--- a/js/nls/zh-cn/TemplateBuilder.js
+++ b/js/nls/zh-cn/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "图层",
       "noLayerFoundText": "未找到任何图层",
       "selectLayer": "选择图层",
+      "appProxiesText": "订阅者访问",
+      "appProxiesDesc": "要通过订阅允许公共访问，请选中相应的复选框。标记为高级的内容将消耗您订阅的配额。",
       "applicationSettingText": "应用程序设置",
       "summaryAttrAscendingOrderTooltip": "升序",
       "onStartLabel": "启动时",
diff --git a/js/nls/zh-hk/TemplateBuilder.js b/js/nls/zh-hk/TemplateBuilder.js
index 9328a86..872cb53 100644
--- a/js/nls/zh-hk/TemplateBuilder.js
+++ b/js/nls/zh-hk/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "圖層",
       "noLayerFoundText": "未找到任何圖層",
       "selectLayer": "選擇圖層",
+      "appProxiesText": "訂閱者存取",
+      "appProxiesDesc": "若要允許透過您的訂閱來公開存取，請勾選適當的方塊。以高級內容標記的內容將使用您訂閱的點數。",
       "applicationSettingText": "應用程式設定",
       "summaryAttrAscendingOrderTooltip": "遞增",
       "onStartLabel": "啟動時",
diff --git a/js/nls/zh-tw/TemplateBuilder.js b/js/nls/zh-tw/TemplateBuilder.js
index 9328a86..872cb53 100644
--- a/js/nls/zh-tw/TemplateBuilder.js
+++ b/js/nls/zh-tw/TemplateBuilder.js
@@ -15,6 +15,8 @@ define({
       "layerLabelText": "圖層",
       "noLayerFoundText": "未找到任何圖層",
       "selectLayer": "選擇圖層",
+      "appProxiesText": "訂閱者存取",
+      "appProxiesDesc": "若要允許透過您的訂閱來公開存取，請勾選適當的方塊。以高級內容標記的內容將使用您訂閱的點數。",
       "applicationSettingText": "應用程式設定",
       "summaryAttrAscendingOrderTooltip": "遞增",
       "onStartLabel": "啟動時",
diff --git a/js/template.js b/js/template.js
index 8dd0af0..ed6f523 100755
--- a/js/template.js
+++ b/js/template.js
@@ -250,8 +250,8 @@ define([
         if (appLocation !== -1) {
           // hosted or portal
           instance = location.pathname.substr(0, appLocation); //get the portal instance name
-          this.config.sharinghost = location.protocol + "//" + location.host + instance;
-          this.config.proxyurl = location.protocol + "//" + location.host + instance + "/sharing/proxy";
+          this.config.sharinghost = "https://" + location.host + instance;
+          this.config.proxyurl = "https://" + location.host + instance + "/sharing/proxy";
         }
       }
       arcgisUtils.arcgisUrl = this.config.sharinghost + "/sharing/rest/content/items";
@@ -507,14 +507,17 @@ define([
           callbackParamName: "callback"
         }).then(lang.hitch(this, function (response) {
           if (this.templateConfig.webTierSecurity) {
-            // Iterate over the list of authorizedCrossOriginDomains
-            // and add each as a javascript obj to the corsEnabledServers
-            if (response.authorizedCrossOriginDomains && response.authorizedCrossOriginDomains.length) {
+            var trustedHost;
+            if (response.authorizedCrossOriginDomains && response.authorizedCrossOriginDomains.length > 0) {
               for (var i = 0; i < response.authorizedCrossOriginDomains.length; i++) {
-                esriConfig.defaults.io.corsEnabledServers.push({
-                  host: response.authorizedCrossOriginDomains[i],
-                  withCredentials: true
-                });
+                trustedHost = response.authorizedCrossOriginDomains[i];
+                // add if trusted host is not null, undefined, or empty string
+                if (esriLang.isDefined(trustedHost) && trustedHost.length > 0) {
+                  esriConfig.defaults.io.corsEnabledServers.push({
+                    host: trustedHost,
+                    withCredentials: true
+                  });
+                }
               }
             }
           }