diff --git a/150-DOCUMENTATION/001-CONFIGURATION/ADAM Education Servers List-updated.xlsx b/150-DOCUMENTATION/001-CONFIGURATION/ADAM Education Servers List-updated.xlsx
index d329e56..497910b 100644
--- a/150-DOCUMENTATION/001-CONFIGURATION/ADAM Education Servers List-updated.xlsx
+++ b/150-DOCUMENTATION/001-CONFIGURATION/ADAM Education Servers List-updated.xlsx
diff --git a/150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Product Sprint 40(30-Sep-2017).xlsx b/150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Product Sprint 40(30-Sep-2017).xlsx
new file mode 100644
index 0000000..db8369c
--- /dev/null
+++ b/150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Product Sprint 40(30-Sep-2017).xlsx
diff --git a/150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Sep17.xlsx b/150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Sep17.xlsx
index c13e3e2..7fcbda7 100644
--- a/150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Sep17.xlsx
+++ b/150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Sep17.xlsx
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 87366bd..8ddc49a 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -273,7 +273,24 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
 
     };
 
+    $scope.DisableUI = function () {
+        alert('disable ui');
+        var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
+        for (var i = 0; i < daImagePanelConetent.length; i++) {
+            daImagePanelConetent[i].style.pointerEvents = "none";
+        }
+        
+    }
 
+    $scope.EnableUI = function () {
+        alert('enable ui');
+        var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
+        for (var i = 0; i < daImagePanelConetent.length; i++) {
+            daImagePanelConetent[i].style.pointerEvents = "auto";
+        }
+
+        alert('enable ui');
+    }
 
     $scope.openView = function ($event) {
         $rootScope.disableAnnotationTB = false;
@@ -1735,6 +1752,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
                                                     }
                                                    );
                 }
+                else if ($scope.ColoredImageSRC.length == totalCanvas)
+                {
+                    // dispatch event for enabling rest UI
+                    alert('all canvas drawn');
+                    $scope.EnableUI();
+                }
+
                 //-NIKI-for solving extarct issue 8286
 
                 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId + '_MR');
@@ -3918,6 +3942,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
         document.getElementById('dot').style.display = 'block';
         document.getElementById('dot').style.left = ((Globe[0].currentX) - 10) + 'px';
         document.getElementById('dot').style.top = ((Globe[0].currentY) + 10) + 'px';
+        document.getElementById('bord').style.display = 'block';
+        document.getElementById('bord').style.left = ((Globe[0].currentX) - 2) + 'px';
+        document.getElementById('bord').style.top = ((Globe[0].currentY) + 1) + 'px';
         document.getElementById('sppeachBubble').style.display = 'block';
         document.getElementById('sppeachBubble').style.left = (Globe[0].currentX) + 'px';
         document.getElementById('sppeachBubble').style.top = (Globe[0].currentY) + 'px';
@@ -4116,6 +4143,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
         document.getElementById('dot_annotation').style.display = 'block';
         document.getElementById('dot_annotation').style.left = ((Globe[0].currentX) - 10) + 'px';
         document.getElementById('dot_annotation').style.top = ((Globe[0].currentY) + 10) + 'px';
+        document.getElementById('bord_annotation').style.display = 'block';
+        document.getElementById('bord_annotation').style.left = ((Globe[0].currentX) - 2) + 'px';
+        document.getElementById('bord_annotation').style.top = ((Globe[0].currentY) + 1) + 'px';
         document.getElementById('sppeachBubble_annotation').style.display = 'block';
         document.getElementById('sppeachBubble_annotation').style.left = (Globe[0].currentX) + 'px';
         document.getElementById('sppeachBubble_annotation').style.top = (Globe[0].currentY) + 'px';
@@ -9411,6 +9441,10 @@ function OnIdentityClick() {
 }
 
 function OnZoom() {
+    alert('on zoom called');
+    var scope = angular.element(document.getElementById("daView")).scope();
+    scope.DisableUI();
+
     if ($(".btn-annotation").hasClass("activebtncolor")) //Bug #14928
         $(".btn-annotation").removeClass("activebtncolor");
     //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in.
@@ -9421,6 +9455,8 @@ function OnZoom() {
     scope.$apply(function () {
         scope.enableZoom();
     });
+
+   
 }
 
 function onListManagerTermSelection(id, isTermListOptionClicked) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 0d1a77c..f4bd971 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -377,7 +377,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                         $rootScope.userModules = userInfo.Modules;
                        
                         $rootScope.isVisibleLogin = false;
-                        
+                        $rootScope.haveRoleAdmin = true;
                         
                         if ($rootScope.refreshcheck == null) {
                             
@@ -388,6 +388,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                         
                     else
                     {
+                        $rootScope.haveRoleAdmin = false;
+
                         if (userInfo.LicenseInfo.IsTermAccepted) {
                             $rootScope.userData = userInfo;
                             $rootScope.userModules = userInfo.Modules;
@@ -995,8 +997,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             // alert($rootScope.AnnotationFontFamily.FontStyle.length);
 
             for (var i = 0; i <= $rootScope.AnnotationFontFamily.FontFamily.length - 1; i++) {
-
-                $("#selected-font-family").append("<option value=" + $rootScope.AnnotationFontFamily.FontFamily[i].FontName + ">" + $rootScope.AnnotationFontFamily.FontFamily[i].FontName + "</option>");
+                var fontName = $rootScope.AnnotationFontFamily.FontFamily[i].FontName;
+                if (/\s/g.test(fontName)) { //Check if white-space exists in between strings
+                    fontName = fontName.replace(" ", "_"); // replace white-space with an underscore
+                }
+                //$rootScope.AnnotationFontFamily.FontFamily[i].FontName
+                $("#selected-font-family").append("<option value=" + fontName + ">" + $rootScope.AnnotationFontFamily.FontFamily[i].FontName + "</option>");
 
             }
             $rootScope.isFontFamilyLoaded = true;
@@ -3039,7 +3045,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                                 $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": $rootScope.TextPropertyArray[i].FontColor });
 
                                 var CurrentFontFamily = $rootScope.TextPropertyArray[i].FontFamily;
-                                //  alert(CurrentFontFamily);
+                                // alert(CurrentFontFamily);
                                 // CurrentFontFamily = CurrentFontFamily.replace(/'/g, "");
                                 var CurrentFontSize = parseInt($rootScope.TextPropertyArray[i].FontSize);
                                 $("#selected-font-family option[value=" + CurrentFontFamily + "]").prop('selected', true);
@@ -3666,6 +3672,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.closeModal = function () {
 
         document.getElementById('modelbackground').style.display = "none";
+        $("#drawTextBGColorpicker span.minicolors-swatch-color").css('background-color', $rootScope.selectedBGColorForTextArea);
 
     }
     //-- End ----------------------------
@@ -4310,6 +4317,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                             }
                             if ($location.url() == "/module-item-view") {
                                 $("#aaDetailViewCanvas").css("display", "none");
+                                $("#canvasPaint").css("display", "none");
+                                $("#canvas").css("display", "none");
+                             
                             }
                         }, 520);
                     }
@@ -4327,6 +4337,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                             }
                             if ($location.url() == "/module-item-view") {
                                 $("#aaDetailViewCanvas").css("display", "none");
+                                $("#canvasPaint").css("display", "none");
+                                $("#canvas").css("display", "none");
                             }
                         }, 320);
                     }
@@ -4484,7 +4496,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $("#annotationToolBarOptions").removeClass("disableMenuoption");
         $("#optionsListManagerTab").removeClass("disableMenuoption");
         $('#fileMenuAnchor').parent().removeClass('disableFileMenu');
-        $("#aaDetailViewCanvas").css("display", "block");
+        if ($location.url() == "/module-item-view") {
+            $("#aaDetailViewCanvas").css("display", "block");
+            $("#canvasPaint").css("display", "block");
+            $("#canvas").css("display", "block");
+        }
         if ($('#jsPanel-1').length > 0)
             $('#jsPanel-1').remove();
         console.log('close');
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index 2f533c3..d75ba6c 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -324,7 +324,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     })
     $rootScope.aaPinDataArray = [];
     $scope.showAllPins = function () {
-      
+       
         $scope.allPinDataArray = [];
         var promise = ModuleService.getPinDataForImage($rootScope.imageName)
 
@@ -576,7 +576,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     }
 
     $scope.showSelectedSystemPins = function (event) {
-
         var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a");
         var bodySystemListlength = bodySystemListObj.length;
         for (var i = 0; i < bodySystemListlength; i++) {
@@ -655,7 +654,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     }
 
     $scope.showAnnotation = function (selectedPinData, isCtrlPressed, isPinClicked, isItemSearched) {
-
+        $scope.clickedPins = [];
         $scope.selectedPin = [];
         var isSameTermWithMultiPin = false;
         var firstPinId = selectedPinData[0]._PinId;
@@ -713,13 +712,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
 
             angular.forEach(pinDataWithFirstTermNumber, function (value, key) {
                 $scope.selectedPin.push(value._PinId);
+                $scope.clickedPins.push({ 'id': value._PinId });
                 var headX = (parseInt(value._HeadX));
                 var headY = (parseInt(value._HeadY));
                 $scope.createSpeechBubble(parseInt(headX) + 10, parseInt(headY) + 10, value._PinId, isCtrlPressed, isPinClicked, isSameTermWithMultiPin);
             })
-
-
-
+           
         }
 
         $rootScope.isLoading = false;
@@ -1360,7 +1358,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     }
 
     $rootScope.hidePins = function () {
-
+        $rootScope.isshowAllPinsBtnAfterHideClicked = false;
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
         $scope.hideSpeechBubble();
@@ -1392,7 +1390,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
         $scope.isHidePinBtnClicked = false;
-
+        $rootScope.isshowAllPinsBtnAfterHideClicked = true;
         if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
 
             $scope.showSystemPins($scope.selectedSystemPinData, false);
@@ -1415,6 +1413,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
 
 
     $scope.showSelectedPins = function () {
+        $rootScope.isshowAllPinsBtnAfterHideClicked = false;
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
 
@@ -1518,8 +1517,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
 
 
     }
-
+    $rootScope.isshowAllPinsBtnAfterHideClicked = true;
     $scope.showItemsForSearch = function () {
+        if($rootScope.isshowAllPinsBtnAfterHideClicked == true){
         console.log('showItemsForSearch is called');
         //this check is for log only because we are writing length so need to check if its not null or undefined
 
@@ -1547,7 +1547,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             }
 
         }, 500);
-
+    }
     }
 
 
@@ -1574,8 +1574,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         $("#termlistfilter li a").css({ "background-color": "#ffffff", "color": "#000000" });
         $("#termlistfilter li #" + $scope.searchItemId).css({ "background-color": "#3399FF", "color": "#ffffff" });
         $scope.searchFilter = $("#" + id).text();
-        selectedTermName.placeholder = $("#" + id).text();
-
+        //selectedTermName.placeholder = $("#" + id).text();
+        selectedTermName.value = $("#" + id).text();
+        selectedTermName.placeholder = "search... ";
 
         //get data from pindata for this trem
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
index 5d2248b..ee41c26 100644
--- a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
+++ b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -986,7 +986,10 @@ background-size:cover;
      {
          color: #fff;
     }
-    
+    #messageModal
+    {
+       z-index: 214748;
+    }
      #messageModal .modal-dialog
        {
         width:300px
@@ -999,7 +1002,8 @@ background-size:cover;
     }
      #messageModal .modal-body
     {
-         text-align:center;
+         text-align: justify;
+         text-align-last: center;
     }
     #messageModal .modal-header 
     {