diff --git a/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-Product Sprint 27(13-Jan-17).ods b/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-Product Sprint 27(13-Jan-17).ods
new file mode 100644
index 0000000..23be4c1
--- /dev/null
+++ b/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-Product Sprint 27(13-Jan-17).ods
diff --git a/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 28(31-Jan-17).ods b/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 28(31-Jan-17).ods
new file mode 100644
index 0000000..9161e78
--- /dev/null
+++ b/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 28(31-Jan-17).ods
diff --git a/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 29(13-Feb-17).ods b/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 29(13-Feb-17).ods
new file mode 100644
index 0000000..dad8f1b
--- /dev/null
+++ b/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 29(13-Feb-17).ods
diff --git a/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 30-32(20-Feb-17)(1).ods b/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 30-32(20-Feb-17)(1).ods
new file mode 100644
index 0000000..d74a6ee
--- /dev/null
+++ b/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 30-32(20-Feb-17)(1).ods
diff --git a/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 30-32(20-Feb-17).ods b/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 30-32(20-Feb-17).ods
new file mode 100644
index 0000000..d2a54ef
--- /dev/null
+++ b/150-DOCUMENTATION/Audit/Estimation/Ebix-Estimation Model_Health_Dev-ProductSprint 30-32(20-Feb-17).ods
diff --git a/400-SOURCECODE/AIAHTML5.API/Controllers/ForgotUserController.cs b/400-SOURCECODE/AIAHTML5.API/Controllers/ForgotUserController.cs
index 2d705a2..23b138f 100644
--- a/400-SOURCECODE/AIAHTML5.API/Controllers/ForgotUserController.cs
+++ b/400-SOURCECODE/AIAHTML5.API/Controllers/ForgotUserController.cs
@@ -49,13 +49,13 @@ namespace AIAHTML5.API.Controllers
                 {
                     logger.Debug("2.  havePassword= " + Convert.ToBoolean(userInfo["havePassword"]));
 
-                    isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, true);
+                    isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, Convert.ToBoolean(userInfo["havePassword"]));
                 }
                 else
                 {
                     logger.Debug("3. havePassword= " + Convert.ToBoolean(userInfo["havePassword"]));
 
-                    isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, false);
+                    isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, Convert.ToBoolean(userInfo["havePassword"]));
                 }
                 logger.Debug("isMailSent= " + isMailSent);
                 if (isMailSent)
diff --git a/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs b/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
index f42e1ab..eacecc5 100644
--- a/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
+++ b/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
@@ -21,7 +21,7 @@ namespace AIAHTML5.API.Models
         public static bool SendEmail(dynamic UserDetails, bool havePassword)
         {
             ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType));
-            logger.Debug("inside SendEmail in  for isPassword =" + havePassword);
+            logger.Debug("inside SendEmail in  for havePassword =" + havePassword);
             
             try
             {
diff --git a/400-SOURCECODE/AIAHTML5.API/Web.config b/400-SOURCECODE/AIAHTML5.API/Web.config
index c80ebf6..f7d8a30 100644
--- a/400-SOURCECODE/AIAHTML5.API/Web.config
+++ b/400-SOURCECODE/AIAHTML5.API/Web.config
@@ -37,9 +37,9 @@
     <add key="SMTPAddress" value="10.100.12.13" />
     <add key="SMTPPort" value="25" />
     <add key="EnableSSL" value="false" />
-    <add key="Site_Url" value ="//52.2.38.120"/>
+    <add key="Site_Url" value ="http://34.207.39.107/"/>
     <add key ="HostAddress" value="10.100.12.13" />
-    <add key="isUserAuthenticated" value="true"/>
+    <add key="isUserAuthenticated" value="false"/>
     <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
   </appSettings>  
   <system.web>
diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
index 5f45e5f..43e95c0 100644
--- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
+++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
index a3f2c58..f7d8a30 100644
--- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
+++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
@@ -37,7 +37,7 @@
     <add key="SMTPAddress" value="10.100.12.13" />
     <add key="SMTPPort" value="25" />
     <add key="EnableSSL" value="false" />
-    <add key="Site_Url" value ="//52.2.38.120"/>
+    <add key="Site_Url" value ="http://34.207.39.107/"/>
     <add key ="HostAddress" value="10.100.12.13" />
     <add key="isUserAuthenticated" value="false"/>
     <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
index 6afcfb5..ff0b095 100644
--- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
+++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js
index cd347b2..534d59f 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js
@@ -1,20 +1,20 @@
-AIA.controller("ADAMImgController", ["$scope", "$rootScope", "pages", "$log","$location",
-function ($scope, $rootScope, pages, log, $location) {
-    $scope.showTabButton = true;
-    $scope.IsVisible = function () {
-        $scope.scroll();
-
-    }
-
-    $scope.scroll = function () {
-        // $window.scrollTo(0, 0);
-        $("html,body").scrollTop(0);
-        //alert("scroll");
-    }
-    $scope.$on('$viewContentLoaded', function (event) {
-        // code that will be executed ... 
-        // every time this view is loaded
-
+AIA.controller("ADAMImgController", ["$scope", "$rootScope", "pages", "$log", "$location",
+function ($scope, $rootScope, pages, log, $location) {
+    $scope.showTabButton = true;
+    $scope.IsVisible = function () {
+        $scope.scroll();
+
+    }
+
+    $scope.scroll = function () {
+        // $window.scrollTo(0, 0);
+        $("html,body").scrollTop(0);
+        //alert("scroll");
+    }
+    $scope.$on('$viewContentLoaded', function (event) {
+        // code that will be executed ... 
+        // every time this view is loaded
+
         //get current path
         var currentURL = $location.path();
         var selectedModuleName = '';
@@ -24,11 +24,11 @@ function ($scope, $rootScope, pages, log, $location) {
                 selectedModuleName = value.name;
             }
             $rootScope.currentActiveModuleTitle = selectedModuleName;
-        })
-    })
-
-}]
-
-
-
+        })
+    })
+
+}]
+
+
+
 );
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
index ee466e7..15e560b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -552,7 +552,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                                  ' kind="captions" srclang="en" label="On"><object width="640" height="360"' +
                                  ' type="application/x-shockwave-flash" data="//vjs.zencdn.net/3.2/video-js.swf"><param name="allowfullscreen" value="true">' +
                                  ' <param name="allowscriptaccess" value="always"><param name="movie" value="//vjs.zencdn.net/3.2/video-js.swf">' +
-   ' <param name="flashvars" ng-value="controls=true&amp;file=' + $scope.clickedCAVideo + '"><img ng-src="content/images/common/player/frameaccuracy_logo.jpg" style="height:80%;" alt="Here we are" title="No video playback capabilities"></object></video><div class="col-sm-12 well"><div id="sid" align="left" style="height:40px;overflow-y:scroll !important"><p>' + $scope.clickedCASummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button></div></div></div>',
+   ' <param name="flashvars" ng-value="controls=true&amp;file=' + $scope.clickedCAVideo + '"><img ng-src="content/images/common/player/frameaccuracy_logo.jpg" style="height:80%;" alt="Here we are" title="No video playback capabilities"></object></video><div class="col-sm-12 well video-subtitle"><div id="sid" align="left" style="height:40px;overflow-y:scroll !important"><p>' + $scope.clickedCASummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button></div></div></div>',
 
                               //ajax: {
                               //    url: 'app/views/ca/ca-view-detail.html'
@@ -581,12 +581,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                           var videoHeight = $('#divplayerinlineVideo div').height();
                           if (videoHeight <= 0)
                               videoHeight = 360;
-                          var textH = $('.well').height();
+                          var textH = $('.video-subtitle').height();
                           textH = textH + 40;
                           var blackBorderHeight = jspContentHeight - (videoHeight + textH);
 
                           if ($('.jsPanel-content').length > 0) {
-                              $('.well').css('margin-bottom', blackBorderHeight);
+                              $('.video-subtitle').css('margin-bottom', blackBorderHeight);
                               $('#divplayerinlineVideo').css('background', '#fff');
                           }
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
index 9ea57b8..b8d6bff 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -158,7 +158,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     };
 
     $scope.loadAllCI = function () {
-
+        $('#ciSpinner').css('visibility', 'visible');
+        $('#ciSpinner').css('zIndex', '20000');
         var promise = DataService.getJson('~/../content/data/json/ci/ci_dat_contentlist.json')
         promise.then(
                   function (result) {
@@ -170,32 +171,41 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                                                       .select();
 
                       // console.log($scope.selectedCIListViewData);
-                      $('#grid-view').empty();
-                      angular.forEach($scope.selectedCIListViewData, function (value, key) {
-                          $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
+                      
 
-                          var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
+
+                      $('#grid-view').empty();
+                      var $e1 = $('<ul><li ng-repeat="value in selectedCIListViewData" ><div id="{{value._id}}" class="col-sm-3 col-md-2" title = "{{value._Title}}"  data-ng-click="openView($event)">'
                               + '<div class="thumbnail" >'
-                                         + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
-                                         + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
+                                         + '<img id="{{value._Title}}" ng-src="~/../content/images/ci/thumbnails/{{value._ThumbnailImage}}" >'//alt="{{value._Title}}" >'
+                                         + '<div class="caption"><p> {{value._Title}}</p></div></a></div></div></li></ul>').appendTo('#grid-view');
+                      $compile($e1)($scope);
+                      //angular.forEach($scope.selectedCIListViewData, function (value, key) {
+                      //    $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
 
+                      //    var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
+                      //        + '<div class="thumbnail" >'
+                      //                   + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
+                      //                   + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
 
-                          $compile($el)($scope);
 
-                          $(".sidebar").mCustomScrollbar({
-                              autoHideScrollbar: true,
-                              //theme:"rounded"
-                          });
+                      //    $compile($el)($scope);
 
-                      });
+                      //    $(".sidebar").mCustomScrollbar({
+                      //        autoHideScrollbar: true,
+                      //        //theme:"rounded"
+                      //    });
 
+                      //});
+                      
+                      $timeout(function () { $('#ciSpinner').css('visibility', 'hidden'); }, 300);
                   },
                   function (error) {
                       // handle errors here
                       console.log(' $scope.IllustrationData = ' + error.statusText);
                   }
                );
-
+       
     }
 
     $scope.IsVisible = function () {
@@ -583,7 +593,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                               parentSlug: 'clinical-illustrations',
                               content: '<div class="row" id="canvasDiv"><div style="align:left;width:100%;height:100%"><canvas id="canvas" ng-click="onDrawingCanvasClick($event)" width="1369" height="325" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1 "></canvas> <canvas id="canvasPaint" ng-click="FreeStylePaint($event)"  width="1369" height="325" class="canvas-annotationStyle1" style="position: absolute;z-index:0;"></canvas></div>' +
                               '<div class="col-sm-12 img-thumbnail" align="center">' +
-                              '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well">' +
+                              '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well img-subtitle">' +
                               '<div align="left" id="sid"><p>' + $scope.clickedCISummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button>' +
                               '<script>$(document).ready(function(){$("#btnTxtOnOff").click(function(){$("#sid").toggle();if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");}else{$(this).text("Text Off");}});});</script></div>' +
                               '</div></div>',
@@ -612,14 +622,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                           var imgHeight = $('.img-thumbnail').find('img').height();
                           if (imgHeight <= 0)
                               imgHeight = 320;
-                          var textH = $('.well').height();
+                          var textH = $('.img-subtitle').height();
                           textH = textH + 40;
                           var blackBorderHeight = jspContentHeight - (imgHeight + textH);
                           if ($('.jsPanel-content').length > 0) {
-                              $('.jsPanel-btn-min').attr('style', 'display: none');
-                              $('.jsPanel-btn-max').attr('style', 'display: none');
-                              $('.jsPanel-btn-norm').attr('style', 'display: none');
-                              $('.well').css('margin-bottom', blackBorderHeight);
+                              $('.img-subtitle').css('margin-bottom', blackBorderHeight);
                           }
                       }
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 49086be..cdf11e5 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -428,7 +428,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     //da-body-views functions
 
     $scope.openBodyView = function () {
-
+        //Check if browser 'REFRESHED' or 'RELOADED'
+        if ($rootScope.CommonData != null) {
         //0. we will initially append container to load body
 
         //check if localstorage has any settings
@@ -455,7 +456,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $rootScope.isVisibleLogin = false;
             $rootScope.loadSearchDataForBodyView();
 
-
             console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId);
 
             var openViews;
@@ -568,8 +568,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     $('#daImagePanel').css("left", '1px');
 
             }, 350);
-        }
+      }
+    }
+    else 
+        {
+            //for now we are redirecting user to index page on page refresh because on refresh we lost the rootscope data and some of application
+            //features stopped working which were depenedent of rootscope data like List manager, annotation toolbar, settings, usermodule list, etc.
+
+            $location.path('/');
 
+            /*relaoding unavailable data for resolving refesh issue*/
+            /*    console.log('Reloading json data for body view => BROWSER REFRESH ISSUE...');
+                $scope.loadDissectibleAnatomyData();
+
+                if ((typeof($rootScope.MenuModuleName) == "undefined") || $rootScope.MenuModuleName == null) {
+                    $rootScope.MenuModuleName = "DA";
+                }*/
+
+
+    }
     }
 
     angular.element(document).ready(function (e) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index e829130..a0410c3 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -3611,8 +3611,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     }
 
     $rootScope.CheckRefresh = function (e) {
+        //Checking if 'REFRESHED' or 'RELOADED' 
         if ((e.keyCode === 116) || (e.keyCode == 82 && e.ctrlKey))
-            $location.path('/');
+            $location.path('/'); //Redirecting to landing page
     };
 }]
 );
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/Link/iframeresizer.html b/400-SOURCECODE/AIAHTML5.Web/app/views/Link/iframeresizer.html
new file mode 100644
index 0000000..b07dbd2
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/Link/iframeresizer.html
@@ -0,0 +1,57 @@
+
+<html> 
+<head>
+<title></title>
+</head>
+  <body onload="parentIframeResize();" > 
+    <script type="text/javascript">
+        // Tell the parent iframe what height the iframe needs to be
+        function parentIframeResize() {
+            var height = getParam('h');
+        //checking for broweser IE7/8/9,FF
+            if (/MSIE (\d+\.\d+);/.test(navigator.userAgent)) { //test for MSIE x.x;
+                var ieversion = new Number(RegExp.$1) // capture x.x portion and store as a number
+                if (ieversion == 9) {                    
+                    if (!parent.parent.name)
+                        parent.parent.resizeIframe(height);
+                    else
+                        parent.resizeIframe(height);
+                }
+                else {                    
+                    if (!parent.parent.parent.id) {
+                        if (parent.parent.resizeIframe!=undefined)
+                          parent.parent.parent.resizeIframe(height);
+
+                    }
+                    else if (!parent.parent.id) {                        
+                        parent.parent.resizeIframe(height);
+                    }
+                    else
+                        parent.resizeIframe(height);
+                }
+            }
+            else {
+               if (!parent.parent.name)
+			   {
+			     if (parent.parent.resizeIframe!=undefined)
+                  parent.parent.resizeIframe(height);
+			   }
+               else
+                  parent.resizeIframe(height);
+            }
+       }
+              
+        // Helper function, parse param from request string
+        function getParam(name) {
+            name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
+            var regexS = "[\\?&]" + name + "=([^&#]*)";
+            var regex = new RegExp(regexS);
+            var results = regex.exec(window.location.href);
+            if (results == null)
+                return "";
+            else
+                return results[1];
+        }
+    </script> 
+  </body> 
+</html>
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
index fb50db5..86c3b6a 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
@@ -180,6 +180,9 @@
             </div>
         </div>
     </div>
+    <div id="ciSpinner" class="spinner" ng-show="isLoading" style="visibility:hidden">
+        <img id="img-spinner" src="content/images/common/loading.gif" alt="Loading" />
+    </div>
 </div>