diff --git a/client/htmls/private/ajax/Settings/BitbucketConfigList.html b/client/htmls/private/ajax/Settings/BitbucketConfigList.html
new file mode 100644
index 000000000..75e0f81b8
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/BitbucketConfigList.html
@@ -0,0 +1,151 @@
+
+<script>
+    $(".login-info").hide();
+    
+</script>
+
+<style>
+    .rowCustomStyle {
+        height: 34px;
+        font-weight: bold;
+    }
+</style>
+
+<div class="row">
+    <div class="col-md-12">
+        <div class="col-md-12">
+
+            <div class="widget-box">
+                <div class="widget-header">
+                    <h5 class="widget-title" style="color:#4e5964;">
+                    <strong>Code Repo</strong>
+                    </h5>
+                    <div class="widget-toolbar no-border">
+                        <div>
+                            <a class="btn btn-minier btn-primary" id="refreshpage" href="#ajax/Settings/DockerTemplatesList.html" style="display:none">
+                                <i class="ace-icon ace-icon fa fa-refresh bigger-110"></i>
+                            </a>                     
+                            <a id="newBit" class="btn btn-minier btn-primary" href="index.html#ajax/Settings/CreateBitbucketConfig.html?new">
+                                <i class="ace-icon ace-icon fa fa-plus bigger-110"></i>
+                                New
+                            </a>                                                
+                        </div>
+                    </div>
+                                            
+                </div>
+                <div class="widget-body">
+                    <div class="widget-main widgetHeight">
+                        <div class="col-md-12" style="padding-left:0px; padding-right:0px;">
+                            <table id="templateTable" class="hidden" cellpadding="5px" width="100%">
+                                <thead>
+                                    <tr class="rowCustomStyle">
+                                        <td>Reference Name</td>
+                                        <td>Code Repo Location (URL)</td>
+                                        <td>Username</td>
+                                        <td>Organization</td>
+                                        <td>Action</td>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr class="hidden rowtemplate">
+                                        <td datafield="bitbucketname"></td>
+                                        <td datafield="bitbucketurl"></td>
+                                        <td datafield="bitbucketusername"></td>
+                                        <td datafield="orgname"></td>
+                                       <td>
+                                            <div class="btn-group tableactionWidth">
+                                                <a class="btn btn-xs btn-info pull-left" title="Edit">
+                                                    <i class="ace-icon fa fa-pencil bigger-120"></i>
+                                                </a>
+                                                <button class="btn btn-xs btn-danger pull-left" value="Remove" title="Delete"><i class="ace-icon fa fa-trash-o bigger-120"></i></button>
+                                                
+                                            </div>
+                                        </td>
+
+                                    </tr>
+                                </tbody>
+                            </table>
+                                <table id="envtable" class="table table-striped table-bordered table-hover dataTable no-footer" cellpadding="5px" width="100%" style="text-align:center";>
+                                    <thead>
+                                        <tr class="rowCustomStyle">
+                                            <td>Reference Name</td>
+                                            <td>Code Repo Location (URL)</td>
+                                            <td>Username</td>
+                                            <td>Organization</td>
+                                            <td>Action</td>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        
+                                       
+                                    </tbody>
+                                    
+                                </table> 
+                            
+                             <script>
+                                    $(document).ready(function () {
+                                        $('select').select2();
+                                        startup(); 
+                                    });
+
+                                function isUserTypeSuperAdmin(){
+                                    $.get('/d4dMasters/loggedInUser',function(data){
+                                      if(!data.isSuperAdmin){
+                                      $('#newBit').attr('disabled','disabled');
+                                      }
+                                    });
+                                   
+                                }
+
+                                    function startup() {
+                                       
+                                        //setting the addnew button to launch popup
+                                        $("#addnewitem").attr('data-toggle', 'modal');
+
+                                        CreateTableFromJsonNew(27,'bitbucketname' , 'CreateBitbucketConfig.html'); //7 is for users
+                                        var tab = 'envtable';
+                                        $('#' + tab).dataTable({
+                                            "pagingType": "full_numbers"
+                                        });
+                                        $('#' + tab + '_info').detach().appendTo('#tableFooterLeft'); 
+                                        $('#' + tab + '_paginate').detach().appendTo('#tableFooterRight');
+                                        $('#' + tab + '_filter').detach().appendTo('#envtable_tools1');
+                                        $('#' + tab + '_length').detach().appendTo('#envtable_tools2');
+
+                                        //Force opening the left navigation menu
+                                        if ($('#navSettings').is(":visible") == false) {
+                                            $('#navSettings').css("display", '');
+                                            $('#navSettings > ul > li').first().addClass('open');
+                                            $('#navSettings > ul > li > ul').css("display", "none");
+                                            $('#navSettings > ul > li > ul').first().css("display", "block");
+                                        }
+                                        //redrawing the breadcrumb and selecting the tree
+                                        $('#Settings  li').removeClass('active');
+                                        $('#Settings  li').each(function () {
+                                            if ($(this).text().trim() == "Bitbucket"){
+                                                $(this).addClass('active');
+                                            }
+                                        });
+                                   //     drawBreadCrumb1();
+                                   //isUserTypeSuperAdmin();
+
+                                    }   
+                    
+                        </script>
+                        <div class="col-md-5">
+
+                            </div>
+                        </div>
+                        
+                    </div>
+                    <div class="widget-toolbox padding-8 clearfix">
+                       <div id="tableFooterLeft" class="pull-left"></div>
+                       <div id="tableFooterRight" class="pull-right"></div>
+                    </div>
+                   
+                    
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/BitbucketConfigList.html.bak b/client/htmls/private/ajax/Settings/BitbucketConfigList.html.bak
new file mode 100644
index 000000000..19bf93643
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/BitbucketConfigList.html.bak
@@ -0,0 +1,151 @@
+
+<script>
+    $(".login-info").hide();
+    
+</script>
+
+<style>
+    .rowCustomStyle {
+        height: 34px;
+        font-weight: bold;
+    }
+</style>
+
+<div class="row">
+    <div class="col-md-12">
+        <div class="col-md-12">
+
+            <div class="widget-box">
+                <div class="widget-header">
+                    <h5 class="widget-title" style="color:#4e5964;">
+                    <strong>Bitbucket</strong>
+                    </h5>
+                    <div class="widget-toolbar no-border">
+                        <div>
+                            <a class="btn btn-minier btn-primary" id="refreshpage" href="#ajax/Settings/DockerTemplatesList.html" style="display:none">
+                                <i class="ace-icon ace-icon fa fa-refresh bigger-110"></i>
+                            </a>                     
+                            <a id="newBit" class="btn btn-minier btn-primary" href="index.html#ajax/Settings/CreateBitbucketConfig.html?new">
+                                <i class="ace-icon ace-icon fa fa-plus bigger-110"></i>
+                                New
+                            </a>                                                
+                        </div>
+                    </div>
+                                            
+                </div>
+                <div class="widget-body">
+                    <div class="widget-main widgetHeight">
+                        <div class="col-md-12" style="padding-left:0px; padding-right:0px;">
+                            <table id="templateTable" class="hidden" cellpadding="5px" width="100%">
+                                <thead>
+                                    <tr class="rowCustomStyle">
+                                        <td>Reference Name</td>
+                                        <td>Bitbucket Location (URL)</td>
+                                        <td>Bitbucket Username</td>
+                                        <td>Organization</td>
+                                        <td>Action</td>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr class="hidden rowtemplate">
+                                        <td datafield="bitbucketname"></td>
+                                        <td datafield="bitbucketurl"></td>
+                                        <td datafield="bitbucketusername"></td>
+                                        <td datafield="orgname"></td>
+                                       <td>
+                                            <div class="btn-group tableactionWidth">
+                                                <a class="btn btn-xs btn-info pull-left" title="Edit">
+                                                    <i class="ace-icon fa fa-pencil bigger-120"></i>
+                                                </a>
+                                                <button class="btn btn-xs btn-danger pull-left" value="Remove" title="Delete"><i class="ace-icon fa fa-trash-o bigger-120"></i></button>
+                                                
+                                            </div>
+                                        </td>
+
+                                    </tr>
+                                </tbody>
+                            </table>
+                                <table id="envtable" class="table table-striped table-bordered table-hover dataTable no-footer" cellpadding="5px" width="100%" style="text-align:center";>
+                                    <thead>
+                                        <tr class="rowCustomStyle">
+                                            <td>Reference Name</td>
+                                            <td>Bitbucket Location (URL)</td>
+                                            <td>Bitbucket Username</td>
+                                            <td>Organization</td>
+                                            <td>Action</td>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        
+                                       
+                                    </tbody>
+                                    
+                                </table> 
+                            
+                             <script>
+                                    $(document).ready(function () {
+                                        $('select').select2();
+                                        startup(); 
+                                    });
+
+                                function isUserTypeSuperAdmin(){
+                                    $.get('/d4dMasters/loggedInUser',function(data){
+                                      if(!data.isSuperAdmin){
+                                      $('#newBit').attr('disabled','disabled');
+                                      }
+                                    });
+                                   
+                                }
+
+                                    function startup() {
+                                       
+                                        //setting the addnew button to launch popup
+                                        $("#addnewitem").attr('data-toggle', 'modal');
+
+                                        CreateTableFromJsonNew(27,'bitbucketname' , 'CreateBitbucketConfig.html'); //7 is for users
+                                        var tab = 'envtable';
+                                        $('#' + tab).dataTable({
+                                            "pagingType": "full_numbers"
+                                        });
+                                        $('#' + tab + '_info').detach().appendTo('#tableFooterLeft'); 
+                                        $('#' + tab + '_paginate').detach().appendTo('#tableFooterRight');
+                                        $('#' + tab + '_filter').detach().appendTo('#envtable_tools1');
+                                        $('#' + tab + '_length').detach().appendTo('#envtable_tools2');
+
+                                        //Force opening the left navigation menu
+                                        if ($('#navSettings').is(":visible") == false) {
+                                            $('#navSettings').css("display", '');
+                                            $('#navSettings > ul > li').first().addClass('open');
+                                            $('#navSettings > ul > li > ul').css("display", "none");
+                                            $('#navSettings > ul > li > ul').first().css("display", "block");
+                                        }
+                                        //redrawing the breadcrumb and selecting the tree
+                                        $('#Settings  li').removeClass('active');
+                                        $('#Settings  li').each(function () {
+                                            if ($(this).text().trim() == "Bitbucket"){
+                                                $(this).addClass('active');
+                                            }
+                                        });
+                                   //     drawBreadCrumb1();
+                                   //isUserTypeSuperAdmin();
+
+                                    }   
+                    
+                        </script>
+                        <div class="col-md-5">
+
+                            </div>
+                        </div>
+                        
+                    </div>
+                    <div class="widget-toolbox padding-8 clearfix">
+                       <div id="tableFooterLeft" class="pull-left"></div>
+                       <div id="tableFooterRight" class="pull-right"></div>
+                    </div>
+                   
+                    
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/CreateBitbucketConfig.html b/client/htmls/private/ajax/Settings/CreateBitbucketConfig.html
new file mode 100644
index 000000000..01f8ed1d7
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/CreateBitbucketConfig.html
@@ -0,0 +1,161 @@
+<div class="row">
+   <div class="col-md-12">
+      <form action="" id="myForm51">
+         <div class="widget-box">
+            <div class="widget-header">
+               <h4 class="widget-margin" style="color:black;">New Code Repo Config  <span id="spnbitbucket"></span></h4>
+            </div> 
+            <div class="widget-body">
+               <fieldset>
+                  <div class="widget-main">
+                     <section id="widget-grid" class="">
+                        <!-- START ROW -->
+                        <div class="row">
+                           <!-- NEW COL START -->
+                              <div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
+                                 <!-- widget div-->
+                                 <div>
+                                    <!-- widget content -->
+                                    <div class="widget-body no-padding">
+                                       <div class="col-lg-6 col-md-6">
+                                          <label for="category">Organization:<span class="control-label redSpan">&nbsp;*</span>
+                                          </label>
+                                          <select id="orgname" class="chooseOrganization width-100" sourcepath="1" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central" cdata="catalyst" cat-validation="required" cat-validation="required" linkedfields="['configname']" onchange="$('#configname').change();">
+                                             <option value="">Select an Organization</option>
+                                          </select>
+                                       </div>
+                                       <div class="col-lg-6 col-md-6">
+                                          <label for="">Name<span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="bitbucketname" class="form-control" type="text"  cdata="catalyst" unique="true"  uniqueconditionedby="bitbucketname"  cat-validation="required,max15">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Repo URL<span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="bitbucketurl" class="form-control" type="text"  cdata="catalyst"  cat-validation="urlcheck,required">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">User ID <span class="control-label redSpan">&nbsp;*</span>
+                                          </label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="bitbucketusername" class="form-control" type="text"  cdata="catalyst" cat-validation="required">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Password <span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="bitbucketpassword" class="form-control" type="password"  cdata="catalyst" cat-validation="required" value="*********">
+                                       </div>
+                                    </div>
+                                    <!-- end widget content -->
+                                 </div>
+                                 <!-- end widget div -->
+                              </div>
+                              <!-- end widget -->             
+                        </div>
+                        <!-- END ROW -->
+                     </section>
+                     <!-- end widget grid -->
+                  </div>
+               </fieldset>
+            </div>
+            <div class="widget-toolbox clearfix">
+               <div class="btn-group pull-right">
+                  <a class="btn btn-default" onclick="window.history.back();" style="margin-right:11px;" id="btncancel">
+                  <i class="ace-icon fa fa-times bigger-110"></i>
+                  Cancel
+                  </a>
+                  <button class="btn btn-primary btn-mini">
+                  <i class="ace-icon fa fa-check bigger-110"></i>
+                  Save
+                  </button>
+               </div>
+            </div>
+         </div>
+      </form>
+   </div>
+</div>
+<!--row ends here-->
+<!--Popup for selecting a cloud provider before proceeding-->
+<script>
+
+//Form Name
+function cancelClicked() {
+  $("#popupSelectProvider").modal('hide');
+  $(".modal-backdrop.fade.in").detach();
+  $('#btncancel').click();
+}
+
+function setfolderpath() { 
+  var folderpath = '';
+  $('#folderpath').val(folderpath);
+}
+
+function validateandsaveform() {
+
+  if (validateForm()) {
+   // setfolderpath();
+    saveform('27');
+  }
+
+}
+
+function inLineReady() {
+
+  $("input[type='text']").on("click", function() {
+    $(this).select();
+    $("#msgOrgName").hide();
+  });
+  $("#popupSelectProvider").modal({
+    keyboard: false,
+    backdrop: "static"
+  });
+  var ten = 27;
+  readformnew('27'); //27 is for bitbucket
+  //
+
+  $('#content').css("opacity", "1 !important");
+  //Force opening the left navigation menu
+  if ($('#navSettings').is(":visible") == false) {
+    $('#navSettings').css("display", '');
+    $('#navSettings > ul > li').first().addClass('open');
+    $('#navSettings > ul > li > ul').css("display", "none");
+    $('#navSettings > ul > li > ul').first().css("display", "block");
+  }
+  //redrawing the breadcrumb and selecting the tree
+  $('#Settings  li').removeClass('active');
+  $('#Settings  li').each(function() {
+
+    if ($(this).text().trim() == "Docker") {
+
+      $(this).addClass('active');
+    }
+  });
+
+  $('#content').css('opacity', '1 !important');
+  enableUniqueCheckingForInputs(27);
+}
+
+inLineReady();
+   
+</script>
+
+<script>
+
+ $(document).ready(function() {
+   $('select').select2();
+   var isEditActivate = location.href.toString().split('?')[1] === "new" ? false : true;
+
+    if (isEditActivate) {
+      $('#orgname').attr('disabled',true);
+      $('input#bitbucketpassword').removeAttr('type');
+      $('input#bitbucketpassword').attr('type', 'password');
+    }
+   $('#myForm51').submit(function() {
+     $(this).validate();
+
+     if ($(this).valid) {
+       validateandsaveform();
+     } else {
+       bootbox.alert('Invalid form submitted'); // for demo
+     }
+     return false; // for demo
+   });
+ });
+       
+</script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/CreateBitbucketConfig.html.bak b/client/htmls/private/ajax/Settings/CreateBitbucketConfig.html.bak
new file mode 100644
index 000000000..40c784fe1
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/CreateBitbucketConfig.html.bak
@@ -0,0 +1,161 @@
+<div class="row">
+   <div class="col-md-12">
+      <form action="" id="myForm51">
+         <div class="widget-box">
+            <div class="widget-header">
+               <h4 class="widget-margin" style="color:black;">New Bitbucket Config  <span id="spnbitbucket"></span></h4>
+            </div>
+            <div class="widget-body">
+               <fieldset>
+                  <div class="widget-main">
+                     <section id="widget-grid" class="">
+                        <!-- START ROW -->
+                        <div class="row">
+                           <!-- NEW COL START -->
+                              <div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
+                                 <!-- widget div-->
+                                 <div>
+                                    <!-- widget content -->
+                                    <div class="widget-body no-padding">
+                                       <div class="col-lg-6 col-md-6">
+                                          <label for="category">Organization:<span class="control-label redSpan">&nbsp;*</span>
+                                          </label>
+                                          <select id="orgname" class="chooseOrganization width-100" sourcepath="1" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central" cdata="catalyst" cat-validation="required" cat-validation="required" linkedfields="['configname']" onchange="$('#configname').change();">
+                                             <option value="">Select an Organization</option>
+                                          </select>
+                                       </div>
+                                       <div class="col-lg-6 col-md-6">
+                                          <label for="">Name<span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="bitbucketname" class="form-control" type="text"  cdata="catalyst" unique="true"  uniqueconditionedby="bitbucketname"  cat-validation="required,max15">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Bitbucket URL<span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="bitbucketurl" class="form-control" type="text"  cdata="catalyst"  cat-validation="urlcheck,required">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">User ID <span class="control-label redSpan">&nbsp;*</span>
+                                          </label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="bitbucketusername" class="form-control" type="text"  cdata="catalyst" cat-validation="required">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Password <span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="bitbucketpassword" class="form-control" type="password"  cdata="catalyst" cat-validation="required" value="*********">
+                                       </div>
+                                    </div>
+                                    <!-- end widget content -->
+                                 </div>
+                                 <!-- end widget div -->
+                              </div>
+                              <!-- end widget -->             
+                        </div>
+                        <!-- END ROW -->
+                     </section>
+                     <!-- end widget grid -->
+                  </div>
+               </fieldset>
+            </div>
+            <div class="widget-toolbox clearfix">
+               <div class="btn-group pull-right">
+                  <a class="btn btn-default" onclick="window.history.back();" style="margin-right:11px;" id="btncancel">
+                  <i class="ace-icon fa fa-times bigger-110"></i>
+                  Cancel
+                  </a>
+                  <button class="btn btn-primary btn-mini">
+                  <i class="ace-icon fa fa-check bigger-110"></i>
+                  Save
+                  </button>
+               </div>
+            </div>
+         </div>
+      </form>
+   </div>
+</div>
+<!--row ends here-->
+<!--Popup for selecting a cloud provider before proceeding-->
+<script>
+
+//Form Name
+function cancelClicked() {
+  $("#popupSelectProvider").modal('hide');
+  $(".modal-backdrop.fade.in").detach();
+  $('#btncancel').click();
+}
+
+function setfolderpath() { 
+  var folderpath = '';
+  $('#folderpath').val(folderpath);
+}
+
+function validateandsaveform() {
+
+  if (validateForm()) {
+   // setfolderpath();
+    saveform('27');
+  }
+
+}
+
+function inLineReady() {
+
+  $("input[type='text']").on("click", function() {
+    $(this).select();
+    $("#msgOrgName").hide();
+  });
+  $("#popupSelectProvider").modal({
+    keyboard: false,
+    backdrop: "static"
+  });
+  var ten = 27;
+  readformnew('27'); //27 is for bitbucket
+  //
+
+  $('#content').css("opacity", "1 !important");
+  //Force opening the left navigation menu
+  if ($('#navSettings').is(":visible") == false) {
+    $('#navSettings').css("display", '');
+    $('#navSettings > ul > li').first().addClass('open');
+    $('#navSettings > ul > li > ul').css("display", "none");
+    $('#navSettings > ul > li > ul').first().css("display", "block");
+  }
+  //redrawing the breadcrumb and selecting the tree
+  $('#Settings  li').removeClass('active');
+  $('#Settings  li').each(function() {
+
+    if ($(this).text().trim() == "Docker") {
+
+      $(this).addClass('active');
+    }
+  });
+
+  $('#content').css('opacity', '1 !important');
+  enableUniqueCheckingForInputs(27);
+}
+
+inLineReady();
+   
+</script>
+
+<script>
+
+ $(document).ready(function() {
+   $('select').select2();
+   var isEditActivate = location.href.toString().split('?')[1] === "new" ? false : true;
+
+    if (isEditActivate) {
+      $('#orgname').attr('disabled',true);
+      $('input#bitbucketpassword').removeAttr('type');
+      $('input#bitbucketpassword').attr('type', 'password');
+    }
+   $('#myForm51').submit(function() {
+     $(this).validate();
+
+     if ($(this).valid) {
+       validateandsaveform();
+     } else {
+       bootbox.alert('Invalid form submitted'); // for demo
+     }
+     return false; // for demo
+   });
+ });
+       
+</script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/CreateFunctionalTestConfig.html b/client/htmls/private/ajax/Settings/CreateFunctionalTestConfig.html
new file mode 100644
index 000000000..456c3136d
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/CreateFunctionalTestConfig.html
@@ -0,0 +1,161 @@
+<div class="row">
+   <div class="col-md-12">
+      <form action="" id="myForm59">
+         <div class="widget-box">
+            <div class="widget-header">
+               <h4 class="widget-margin" style="color:black;">New QA Portal  <span id="spfunctionaltest"></span></h4>
+            </div>
+            <div class="widget-body">
+               <fieldset>
+                  <div class="widget-main">
+                     <section id="widget-grid" class="">
+                        <!-- START ROW -->
+                        <div class="row">
+                           <!-- NEW COL START -->
+                              <div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
+                                 <!-- widget div-->
+                                 <div>
+                                    <!-- widget content -->
+                                    <div class="widget-body no-padding">
+                                       <div class="col-lg-6 col-md-6">
+                                          <label for="category">Organization:<span class="control-label redSpan">&nbsp;*</span>
+                                          </label>
+                                          <select id="orgname" class="chooseOrganization width-100" sourcepath="1" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central" cdata="catalyst" cat-validation="required" cat-validation="required" linkedfields="['configname']" onchange="$('#configname').change();">
+                                             <option value="">Select an Organization</option>
+                                          </select>
+                                       </div>
+                                       <div class="col-lg-6 col-md-6">
+                                          <label for="">Name<span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="functionaltestname" class="form-control" type="text"  cdata="catalyst" unique="true"  uniqueconditionedby="functionaltestname"  cat-validation="required,max15">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Portal URL<span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="functionaltesturl" class="form-control" type="text"  cdata="catalyst"  cat-validation="urlcheck,required">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Days <span class="control-label redSpan">&nbsp;*</span>
+                                          </label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="functionaltestdays" class="form-control" type="text"  cdata="catalyst" cat-validation="required">
+                                       </div>
+                                       <!-- <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Password <span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="bitbucketpassword" class="form-control" type="text"  cdata="catalyst" cat-validation="required" value="*********">
+                                       </div> -->
+                                    </div>
+                                    <!-- end widget content -->
+                                 </div>
+                                 <!-- end widget div -->
+                              </div>
+                              <!-- end widget -->             
+                        </div>
+                        <!-- END ROW -->
+                     </section>
+                     <!-- end widget grid -->
+                  </div>
+               </fieldset>
+            </div>
+            <div class="widget-toolbox clearfix">
+               <div class="btn-group pull-right">
+                  <a class="btn btn-default" onclick="window.history.back();" style="margin-right:11px;" id="btncancel">
+                  <i class="ace-icon fa fa-times bigger-110"></i>
+                  Cancel
+                  </a>
+                  <button class="btn btn-primary btn-mini">
+                  <i class="ace-icon fa fa-check bigger-110"></i>
+                  Save
+                  </button>
+               </div>
+            </div>
+         </div>
+      </form>
+   </div>
+</div>
+<!--row ends here-->
+<!--Popup for selecting a cloud provider before proceeding-->
+<script>
+
+//Form Name
+function cancelClicked() {
+  $("#popupSelectProvider").modal('hide');
+  $(".modal-backdrop.fade.in").detach();
+  $('#btncancel').click();
+}
+
+function setfolderpath() { 
+  var folderpath = '';
+  $('#folderpath').val(folderpath);
+}
+
+function validateandsaveform() {
+
+  if (validateForm()) {
+   // setfolderpath();
+    saveform('29');
+  }
+
+}
+
+function inLineReady() {
+
+  $("input[type='text']").on("click", function() {
+    $(this).select();
+    $("#msgOrgName").hide();
+  });
+  $("#popupSelectProvider").modal({
+    keyboard: false,
+    backdrop: "static"
+  });
+  var ten = 27;
+  readformnew('29'); //29 is for functionaltest
+  //
+
+  $('#content').css("opacity", "1 !important");
+  //Force opening the left navigation menu
+  if ($('#navSettings').is(":visible") == false) {
+    $('#navSettings').css("display", '');
+    $('#navSettings > ul > li').first().addClass('open');
+    $('#navSettings > ul > li > ul').css("display", "none");
+    $('#navSettings > ul > li > ul').first().css("display", "block");
+  }
+  //redrawing the breadcrumb and selecting the tree
+  $('#Settings  li').removeClass('active');
+  $('#Settings  li').each(function() {
+
+    if ($(this).text().trim() == "Docker") {
+
+      $(this).addClass('active');
+    }
+  });
+
+  $('#content').css('opacity', '1 !important');
+  enableUniqueCheckingForInputs(29);
+}
+
+inLineReady();
+   
+</script>
+
+<script>
+
+ $(document).ready(function() {
+   $('select').select2();
+   var isEditActivate = location.href.toString().split('?')[1] === "new" ? false : true;
+
+    if (isEditActivate) {
+      $('#orgname').attr('disabled',true);
+      // $('input#bitbucketpassword').removeAttr('type');
+      // $('input#bitbucketpassword').attr('type', 'password');
+    }
+   $('#myForm59').submit(function() {
+     $(this).validate();
+
+     if ($(this).valid) {
+       validateandsaveform();
+     } else {
+       bootbox.alert('Invalid form submitted'); // for demo
+     }
+     return false; // for demo
+   });
+ });
+       
+</script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/CreateJiraConfig.html b/client/htmls/private/ajax/Settings/CreateJiraConfig.html
new file mode 100644
index 000000000..7c7e07027
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/CreateJiraConfig.html
@@ -0,0 +1,162 @@
+<div class="row">
+   <div class="col-md-12">
+      <form action="" id="myForm53">
+         <div class="widget-box">
+            <div class="widget-header">
+               <h4 class="widget-margin" style="color:black;">New Jira Config  <span id="spnjira"></span></h4>
+            </div>
+            <div class="widget-body">
+               <fieldset>
+                  <div class="widget-main">
+                     <section id="widget-grid" class="">
+                        <!-- START ROW -->
+                        <div class="row">
+                           <!-- NEW COL START -->
+                              <div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
+                                 <!-- widget div-->
+                                 <div>
+                                    <!-- widget content -->
+                                    <div class="widget-body no-padding">
+                                       <div class="col-lg-6 col-md-6">
+                                          <label for="category">Organization:<span class="control-label redSpan">&nbsp;*</span>
+                                          </label>
+                                          <select id="orgname" class="chooseOrganization width-100" sourcepath="1" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central" cdata="catalyst" cat-validation="required" cat-validation="required" linkedfields="['configname']" onchange="$('#configname').change();">
+                                             <option value="">Select an Organization</option>
+                                          </select>
+                                       </div>
+                                       <div class="col-lg-6 col-md-6">
+                                          <label for="">Name<span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="jiraname" class="form-control" type="text"  cdata="catalyst" unique="true"  uniqueconditionedby="jiraname"  cat-validation="required,max15">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Jira URL<span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="jiraurl" class="form-control" type="text"  cdata="catalyst"  cat-validation="urlcheck,required">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Jira Key <span class="control-label redSpan">&nbsp;*</span>
+                                          </label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="jirakey" class="form-control" type="text"  cdata="catalyst" cat-validation="required">
+                                          This command will make this for you:  echo -n username:password | base64
+                                       </div>
+                                       <!-- <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Password <span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="bitbucketpassword" class="form-control" type="text"  cdata="catalyst" cat-validation="required" value="*********">
+                                       </div> -->
+                                    </div>
+                                    <!-- end widget content -->
+                                 </div>
+                                 <!-- end widget div -->
+                              </div>
+                              <!-- end widget -->             
+                        </div>
+                        <!-- END ROW -->
+                     </section>
+                     <!-- end widget grid -->
+                  </div>
+               </fieldset>
+            </div>
+            <div class="widget-toolbox clearfix">
+               <div class="btn-group pull-right">
+                  <a class="btn btn-default" onclick="window.history.back();" style="margin-right:11px;" id="btncancel">
+                  <i class="ace-icon fa fa-times bigger-110"></i>
+                  Cancel
+                  </a>
+                  <button class="btn btn-primary btn-mini">
+                  <i class="ace-icon fa fa-check bigger-110"></i>
+                  Save
+                  </button>
+               </div>
+            </div>
+         </div>
+      </form>
+   </div>
+</div>
+<!--row ends here-->
+<!--Popup for selecting a cloud provider before proceeding-->
+<script>
+
+//Form Name
+function cancelClicked() {
+  $("#popupSelectProvider").modal('hide');
+  $(".modal-backdrop.fade.in").detach();
+  $('#btncancel').click();
+}
+
+function setfolderpath() { 
+  var folderpath = '';
+  $('#folderpath').val(folderpath);
+}
+
+function validateandsaveform() {
+
+  if (validateForm()) {
+   // setfolderpath();
+    saveform('23');
+  }
+
+}
+
+function inLineReady() {
+
+  $("input[type='text']").on("click", function() {
+    $(this).select();
+    $("#msgOrgName").hide();
+  });
+  $("#popupSelectProvider").modal({
+    keyboard: false,
+    backdrop: "static"
+  });
+  var ten = 23;
+  readformnew('23'); //29 is for jira
+  //
+
+  $('#content').css("opacity", "1 !important");
+  //Force opening the left navigation menu
+  if ($('#navSettings').is(":visible") == false) {
+    $('#navSettings').css("display", '');
+    $('#navSettings > ul > li').first().addClass('open');
+    $('#navSettings > ul > li > ul').css("display", "none");
+    $('#navSettings > ul > li > ul').first().css("display", "block");
+  }
+  //redrawing the breadcrumb and selecting the tree
+  $('#Settings  li').removeClass('active');
+  $('#Settings  li').each(function() {
+
+    if ($(this).text().trim() == "Docker") {
+
+      $(this).addClass('active');
+    }
+  });
+
+  $('#content').css('opacity', '1 !important');
+  enableUniqueCheckingForInputs(23);
+}
+
+inLineReady();
+   
+</script>
+
+<script>
+
+ $(document).ready(function() {
+   $('select').select2();
+   var isEditActivate = location.href.toString().split('?')[1] === "new" ? false : true;
+
+    if (isEditActivate) {
+      $('#orgname').attr('disabled',true);
+      // $('input#bitbucketpassword').removeAttr('type');
+      // $('input#bitbucketpassword').attr('type', 'password');
+    }
+   $('#myForm53').submit(function() {
+     $(this).validate();
+
+     if ($(this).valid) {
+       validateandsaveform();
+     } else {
+       bootbox.alert('Invalid form submitted'); // for demo
+     }
+     return false; // for demo
+   });
+ });
+       
+</script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/CreateJiraConfig.html.bak b/client/htmls/private/ajax/Settings/CreateJiraConfig.html.bak
new file mode 100644
index 000000000..fc73c523c
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/CreateJiraConfig.html.bak
@@ -0,0 +1,162 @@
+<div class="row">
+   <div class="col-md-12">
+      <form action="" id="myForm53">
+         <div class="widget-box">
+            <div class="widget-header">
+               <h4 class="widget-margin" style="color:black;">New Jira Config  <span id="spnjira"></span></h4>
+            </div>
+            <div class="widget-body">
+               <fieldset>
+                  <div class="widget-main">
+                     <section id="widget-grid" class="">
+                        <!-- START ROW -->
+                        <div class="row">
+                           <!-- NEW COL START -->
+                              <div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
+                                 <!-- widget div-->
+                                 <div>
+                                    <!-- widget content -->
+                                    <div class="widget-body no-padding">
+                                       <div class="col-lg-6 col-md-6">
+                                          <label for="category">Organization:<span class="control-label redSpan">&nbsp;*</span>
+                                          </label>
+                                          <select id="orgname" class="chooseOrganization width-100" sourcepath="1" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central" cdata="catalyst" cat-validation="required" cat-validation="required" linkedfields="['configname']" onchange="$('#configname').change();">
+                                             <option value="">Select an Organization</option>
+                                          </select>
+                                       </div>
+                                       <div class="col-lg-6 col-md-6">
+                                          <label for="">Name<span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="jirausername" class="form-control" type="text"  cdata="catalyst" unique="true"  uniqueconditionedby="jiraname"  cat-validation="required,max15">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Jira URL<span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="jiraurl" class="form-control" type="text"  cdata="catalyst"  cat-validation="urlcheck,required">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Jira Key <span class="control-label redSpan">&nbsp;*</span>
+                                          </label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="jirakey" class="form-control" type="text"  cdata="catalyst" cat-validation="required">
+                                          This command will make this for you:  echo -n username:password | base64
+                                       </div>
+                                       <!-- <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Password <span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="bitbucketpassword" class="form-control" type="text"  cdata="catalyst" cat-validation="required" value="*********">
+                                       </div> -->
+                                    </div>
+                                    <!-- end widget content -->
+                                 </div>
+                                 <!-- end widget div -->
+                              </div>
+                              <!-- end widget -->             
+                        </div>
+                        <!-- END ROW -->
+                     </section>
+                     <!-- end widget grid -->
+                  </div>
+               </fieldset>
+            </div>
+            <div class="widget-toolbox clearfix">
+               <div class="btn-group pull-right">
+                  <a class="btn btn-default" onclick="window.history.back();" style="margin-right:11px;" id="btncancel">
+                  <i class="ace-icon fa fa-times bigger-110"></i>
+                  Cancel
+                  </a>
+                  <button class="btn btn-primary btn-mini">
+                  <i class="ace-icon fa fa-check bigger-110"></i>
+                  Save
+                  </button>
+               </div>
+            </div>
+         </div>
+      </form>
+   </div>
+</div>
+<!--row ends here-->
+<!--Popup for selecting a cloud provider before proceeding-->
+<script>
+
+//Form Name
+function cancelClicked() {
+  $("#popupSelectProvider").modal('hide');
+  $(".modal-backdrop.fade.in").detach();
+  $('#btncancel').click();
+}
+
+function setfolderpath() { 
+  var folderpath = '';
+  $('#folderpath').val(folderpath);
+}
+
+function validateandsaveform() {
+
+  if (validateForm()) {
+   // setfolderpath();
+    saveform('23');
+  }
+
+}
+
+function inLineReady() {
+
+  $("input[type='text']").on("click", function() {
+    $(this).select();
+    $("#msgOrgName").hide();
+  });
+  $("#popupSelectProvider").modal({
+    keyboard: false,
+    backdrop: "static"
+  });
+  var ten = 23;
+  readformnew('23'); //29 is for jira
+  //
+
+  $('#content').css("opacity", "1 !important");
+  //Force opening the left navigation menu
+  if ($('#navSettings').is(":visible") == false) {
+    $('#navSettings').css("display", '');
+    $('#navSettings > ul > li').first().addClass('open');
+    $('#navSettings > ul > li > ul').css("display", "none");
+    $('#navSettings > ul > li > ul').first().css("display", "block");
+  }
+  //redrawing the breadcrumb and selecting the tree
+  $('#Settings  li').removeClass('active');
+  $('#Settings  li').each(function() {
+
+    if ($(this).text().trim() == "Docker") {
+
+      $(this).addClass('active');
+    }
+  });
+
+  $('#content').css('opacity', '1 !important');
+  enableUniqueCheckingForInputs(23);
+}
+
+inLineReady();
+   
+</script>
+
+<script>
+
+ $(document).ready(function() {
+   $('select').select2();
+   var isEditActivate = location.href.toString().split('?')[1] === "new" ? false : true;
+
+    if (isEditActivate) {
+      $('#orgname').attr('disabled',true);
+      // $('input#bitbucketpassword').removeAttr('type');
+      // $('input#bitbucketpassword').attr('type', 'password');
+    }
+   $('#myForm53').submit(function() {
+     $(this).validate();
+
+     if ($(this).valid) {
+       validateandsaveform();
+     } else {
+       bootbox.alert('Invalid form submitted'); // for demo
+     }
+     return false; // for demo
+   });
+ });
+       
+</script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/CreateOctopusConfig.html b/client/htmls/private/ajax/Settings/CreateOctopusConfig.html
new file mode 100644
index 000000000..e370b62e9
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/CreateOctopusConfig.html
@@ -0,0 +1,161 @@
+<div class="row">
+   <div class="col-md-12">
+      <form action="" id="myForm52">
+         <div class="widget-box">
+            <div class="widget-header">
+               <h4 class="widget-margin" style="color:black;">New Octopus Config  <span id="spnoctopus"></span></h4>
+            </div>
+            <div class="widget-body">
+               <fieldset>
+                  <div class="widget-main">
+                     <section id="widget-grid" class="">
+                        <!-- START ROW -->
+                        <div class="row">
+                           <!-- NEW COL START -->
+                              <div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
+                                 <!-- widget div-->
+                                 <div>
+                                    <!-- widget content -->
+                                    <div class="widget-body no-padding">
+                                       <div class="col-lg-6 col-md-6">
+                                          <label for="category">Organization:<span class="control-label redSpan">&nbsp;*</span>
+                                          </label>
+                                          <select id="orgname" class="chooseOrganization width-100" sourcepath="1" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central" cdata="catalyst" cat-validation="required" cat-validation="required" linkedfields="['configname']" onchange="$('#configname').change();">
+                                             <option value="">Select an Organization</option>
+                                          </select>
+                                       </div>
+                                       <div class="col-lg-6 col-md-6">
+                                          <label for="">Name<span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="octopusname" class="form-control" type="text"  cdata="catalyst" unique="true"  uniqueconditionedby="octopusname"  cat-validation="required,max15">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Octopus URL<span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="octopusurl" class="form-control" type="text"  cdata="catalyst"  cat-validation="urlcheck,required">
+                                       </div>
+                                       <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Key <span class="control-label redSpan">&nbsp;*</span>
+                                          </label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="octopuskey" class="form-control" type="text"  cdata="catalyst" cat-validation="required">
+                                       </div>
+                                       <!-- <div class="col-lg-6 col-md-6" style="margin-top:25px">
+                                          <label for="">Password <span class="control-label redSpan">&nbsp;*</span></label>
+                                          <input name="ctl00$MainContent$orgname" value="" id="bitbucketpassword" class="form-control" type="text"  cdata="catalyst" cat-validation="required" value="*********">
+                                       </div> -->
+                                    </div>
+                                    <!-- end widget content -->
+                                 </div>
+                                 <!-- end widget div -->
+                              </div>
+                              <!-- end widget -->             
+                        </div>
+                        <!-- END ROW -->
+                     </section>
+                     <!-- end widget grid -->
+                  </div>
+               </fieldset>
+            </div>
+            <div class="widget-toolbox clearfix">
+               <div class="btn-group pull-right">
+                  <a class="btn btn-default" onclick="window.history.back();" style="margin-right:11px;" id="btncancel">
+                  <i class="ace-icon fa fa-times bigger-110"></i>
+                  Cancel
+                  </a>
+                  <button class="btn btn-primary btn-mini">
+                  <i class="ace-icon fa fa-check bigger-110"></i>
+                  Save
+                  </button>
+               </div>
+            </div>
+         </div>
+      </form>
+   </div>
+</div>
+<!--row ends here-->
+<!--Popup for selecting a cloud provider before proceeding-->
+<script>
+
+//Form Name
+function cancelClicked() {
+  $("#popupSelectProvider").modal('hide');
+  $(".modal-backdrop.fade.in").detach();
+  $('#btncancel').click();
+}
+
+function setfolderpath() { 
+  var folderpath = '';
+  $('#folderpath').val(folderpath);
+}
+
+function validateandsaveform() {
+
+  if (validateForm()) {
+   // setfolderpath();
+    saveform('28');
+  }
+
+}
+
+function inLineReady() {
+
+  $("input[type='text']").on("click", function() {
+    $(this).select();
+    $("#msgOrgName").hide();
+  });
+  $("#popupSelectProvider").modal({
+    keyboard: false,
+    backdrop: "static"
+  });
+  var ten = 27;
+  readformnew('28'); //28 is for octopus
+  //
+
+  $('#content').css("opacity", "1 !important");
+  //Force opening the left navigation menu
+  if ($('#navSettings').is(":visible") == false) {
+    $('#navSettings').css("display", '');
+    $('#navSettings > ul > li').first().addClass('open');
+    $('#navSettings > ul > li > ul').css("display", "none");
+    $('#navSettings > ul > li > ul').first().css("display", "block");
+  }
+  //redrawing the breadcrumb and selecting the tree
+  $('#Settings  li').removeClass('active');
+  $('#Settings  li').each(function() {
+
+    if ($(this).text().trim() == "Docker") {
+
+      $(this).addClass('active');
+    }
+  });
+
+  $('#content').css('opacity', '1 !important');
+  enableUniqueCheckingForInputs(28);
+}
+
+inLineReady();
+   
+</script>
+
+<script>
+
+ $(document).ready(function() {
+   $('select').select2();
+   var isEditActivate = location.href.toString().split('?')[1] === "new" ? false : true;
+
+    if (isEditActivate) {
+      $('#orgname').attr('disabled',true);
+      // $('input#bitbucketpassword').removeAttr('type');
+      // $('input#bitbucketpassword').attr('type', 'password');
+    }
+   $('#myForm52').submit(function() {
+     $(this).validate();
+
+     if ($(this).valid) {
+       validateandsaveform();
+     } else {
+       bootbox.alert('Invalid form submitted'); // for demo
+     }
+     return false; // for demo
+   });
+ });
+       
+</script>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/FunctionalTestConfigList.html b/client/htmls/private/ajax/Settings/FunctionalTestConfigList.html
new file mode 100644
index 000000000..1e5cd1899
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/FunctionalTestConfigList.html
@@ -0,0 +1,151 @@
+
+<script>
+    $(".login-info").hide();
+    
+</script>
+
+<style>
+    .rowCustomStyle {
+        height: 34px;
+        font-weight: bold;
+    }
+</style>
+
+<div class="row">
+    <div class="col-md-12">
+        <div class="col-md-12">
+
+            <div class="widget-box">
+                <div class="widget-header">
+                    <h5 class="widget-title" style="color:#4e5964;">
+                    <strong>QA Portals</strong>
+                    </h5>
+                    <div class="widget-toolbar no-border">
+                        <div>
+                            <a class="btn btn-minier btn-primary" id="refreshpage" href="#ajax/Settings/DockerTemplatesList.html" style="display:none">
+                                <i class="ace-icon ace-icon fa fa-refresh bigger-110"></i>
+                            </a>                     
+                            <a id="newBit" class="btn btn-minier btn-primary" href="index.html#ajax/Settings/CreateFunctionalTestConfig.html?new">
+                                <i class="ace-icon ace-icon fa fa-plus bigger-110"></i>
+                                New
+                            </a>                                                
+                        </div>
+                    </div>
+                                            
+                </div>
+                <div class="widget-body">
+                    <div class="widget-main widgetHeight">
+                        <div class="col-md-12" style="padding-left:0px; padding-right:0px;">
+                            <table id="templateTable" class="hidden" cellpadding="5px" width="100%">
+                                <thead>
+                                    <tr class="rowCustomStyle">
+                                        <td>Reference Name</td>
+                                        <td>Portal (URL)</td>
+                                        <td>Log Days</td>
+                                        <td>Organization</td>
+                                        <td>Action</td>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr class="hidden rowtemplate">
+                                        <td datafield="functionaltestname"></td>
+                                        <td datafield="functionaltesturl"></td>
+                                        <td datafield="functionaltestdays"></td>
+                                        <td datafield="orgname"></td>
+                                       <td>
+                                            <div class="btn-group tableactionWidth">
+                                                <a class="btn btn-xs btn-info pull-left" title="Edit">
+                                                    <i class="ace-icon fa fa-pencil bigger-120"></i>
+                                                </a>
+                                                <button class="btn btn-xs btn-danger pull-left" value="Remove" title="Delete"><i class="ace-icon fa fa-trash-o bigger-120"></i></button>
+                                                
+                                            </div>
+                                        </td>
+
+                                    </tr>
+                                </tbody>
+                            </table>
+                                <table id="envtable" class="table table-striped table-bordered table-hover dataTable no-footer" cellpadding="5px" width="100%" style="text-align:center";>
+                                    <thead>
+                                        <tr class="rowCustomStyle">
+                                            <td>Reference Name</td>
+	                                        <td>Portal (URL)</td>
+	                                        <td>Log Days</td>
+	                                        <td>Organization</td>
+	                                        <td>Action</td>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        
+                                       
+                                    </tbody>
+                                    
+                                </table> 
+                            
+                             <script>
+                                    $(document).ready(function () {
+                                        $('select').select2();
+                                        startup(); 
+                                    });
+
+                                function isUserTypeSuperAdmin(){
+                                    $.get('/d4dMasters/loggedInUser',function(data){
+                                      if(!data.isSuperAdmin){
+                                      $('#newBit').attr('disabled','disabled');
+                                      }
+                                    });
+                                   
+                                }
+
+                                    function startup() {
+                                       
+                                        //setting the addnew button to launch popup
+                                        $("#addnewitem").attr('data-toggle', 'modal');
+
+                                        CreateTableFromJsonNew(29,'functionaltestname' , 'CreateFunctionalTestConfig.html'); //7 is for users
+                                        var tab = 'envtable';
+                                        $('#' + tab).dataTable({
+                                            "pagingType": "full_numbers"
+                                        });
+                                        $('#' + tab + '_info').detach().appendTo('#tableFooterLeft'); 
+                                        $('#' + tab + '_paginate').detach().appendTo('#tableFooterRight');
+                                        $('#' + tab + '_filter').detach().appendTo('#envtable_tools1');
+                                        $('#' + tab + '_length').detach().appendTo('#envtable_tools2');
+
+                                        //Force opening the left navigation menu
+                                        if ($('#navSettings').is(":visible") == false) {
+                                            $('#navSettings').css("display", '');
+                                            $('#navSettings > ul > li').first().addClass('open');
+                                            $('#navSettings > ul > li > ul').css("display", "none");
+                                            $('#navSettings > ul > li > ul').first().css("display", "block");
+                                        }
+                                        //redrawing the breadcrumb and selecting the tree
+                                        $('#Settings  li').removeClass('active');
+                                        $('#Settings  li').each(function () {
+                                            if ($(this).text().trim() == "Bitbucket"){
+                                                $(this).addClass('active');
+                                            }
+                                        });
+                                   //     drawBreadCrumb1();
+                                   //isUserTypeSuperAdmin();
+
+                                    }   
+                    
+                        </script>
+                        <div class="col-md-5">
+
+                            </div>
+                        </div>
+                        
+                    </div>
+                    <div class="widget-toolbox padding-8 clearfix">
+                       <div id="tableFooterLeft" class="pull-left"></div>
+                       <div id="tableFooterRight" class="pull-right"></div>
+                    </div>
+                   
+                    
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/JiraConfigList.html b/client/htmls/private/ajax/Settings/JiraConfigList.html
new file mode 100644
index 000000000..edfa22891
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/JiraConfigList.html
@@ -0,0 +1,151 @@
+
+<script>
+    $(".login-info").hide();
+    
+</script>
+
+<style>
+    .rowCustomStyle {
+        height: 34px;
+        font-weight: bold;
+    }
+</style>
+
+<div class="row">
+    <div class="col-md-12">
+        <div class="col-md-12">
+
+            <div class="widget-box">
+                <div class="widget-header">
+                    <h5 class="widget-title" style="color:#4e5964;">
+                    <strong>Jira</strong>
+                    </h5>
+                    <div class="widget-toolbar no-border">
+                        <div>
+                            <a class="btn btn-minier btn-primary" id="refreshpage" href="#ajax/Settings/DockerTemplatesList.html" style="display:none">
+                                <i class="ace-icon ace-icon fa fa-refresh bigger-110"></i>
+                            </a>                     
+                            <a id="newJira" class="btn btn-minier btn-primary" href="index.html#ajax/Settings/CreateJiraConfig.html?new">
+                                <i class="ace-icon ace-icon fa fa-plus bigger-110"></i>
+                                New
+                            </a>                                                
+                        </div>
+                    </div>
+                                            
+                </div>
+                <div class="widget-body">
+                    <div class="widget-main widgetHeight">
+                        <div class="col-md-12" style="padding-left:0px; padding-right:0px;">
+                            <table id="templateTable" class="hidden" cellpadding="5px" width="100%">
+                                <thead>
+                                    <tr class="rowCustomStyle">
+                                        <td>Reference Name</td>
+                                        <td>Jira Location (URL)</td>
+                                        <!-- <td>Jira Username</td> -->
+                                        <td>Organization</td>
+                                        <td>Action</td>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr class="hidden rowtemplate">
+                                        <td datafield="jiraname"></td>
+                                        <td datafield="jiraurl"></td>
+                                        <!-- <td datafield="bitbucketusername"></td> -->
+                                        <td datafield="orgname"></td>
+                                       <td>
+                                            <div class="btn-group tableactionWidth">
+                                                <a class="btn btn-xs btn-info pull-left" title="Edit">
+                                                    <i class="ace-icon fa fa-pencil bigger-120"></i>
+                                                </a>
+                                                <button class="btn btn-xs btn-danger pull-left" value="Remove" title="Delete"><i class="ace-icon fa fa-trash-o bigger-120"></i></button>
+                                                
+                                            </div>
+                                        </td>
+
+                                    </tr>
+                                </tbody>
+                            </table>
+                                <table id="envtable" class="table table-striped table-bordered table-hover dataTable no-footer" cellpadding="5px" width="100%" style="text-align:center";>
+                                    <thead>
+                                        <tr class="rowCustomStyle">
+                                          <td>Reference Name</td>
+                                        <td>Jira Location (URL)</td>
+                                        <!-- <td>Jira Username</td> -->
+                                        <td>Organization</td>
+                                        <td>Action</td>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        
+                                       
+                                    </tbody>
+                                    
+                                </table> 
+                            
+                             <script>
+                                    $(document).ready(function () {
+                                        $('select').select2();
+                                        startup(); 
+                                    });
+
+                                function isUserTypeSuperAdmin(){
+                                    $.get('/d4dMasters/loggedInUser',function(data){
+                                      if(!data.isSuperAdmin){
+                                      $('#newJira').attr('disabled','disabled');
+                                      }
+                                    });
+                                   
+                                }
+
+                                    function startup() {
+                                       
+                                        //setting the addnew button to launch popup
+                                        $("#addnewitem").attr('data-toggle', 'modal');
+
+                                        CreateTableFromJsonNew(23,'jiraname' , 'CreateJiraConfig.html'); //7 is for users
+                                        var tab = 'envtable';
+                                        $('#' + tab).dataTable({
+                                            "pagingType": "full_numbers"
+                                        });
+                                        $('#' + tab + '_info').detach().appendTo('#tableFooterLeft'); 
+                                        $('#' + tab + '_paginate').detach().appendTo('#tableFooterRight');
+                                        $('#' + tab + '_filter').detach().appendTo('#envtable_tools1');
+                                        $('#' + tab + '_length').detach().appendTo('#envtable_tools2');
+
+                                        //Force opening the left navigation menu
+                                        if ($('#navSettings').is(":visible") == false) {
+                                            $('#navSettings').css("display", '');
+                                            $('#navSettings > ul > li').first().addClass('open');
+                                            $('#navSettings > ul > li > ul').css("display", "none");
+                                            $('#navSettings > ul > li > ul').first().css("display", "block");
+                                        }
+                                        //redrawing the breadcrumb and selecting the tree
+                                        $('#Settings  li').removeClass('active');
+                                        $('#Settings  li').each(function () {
+                                            if ($(this).text().trim() == "Octopus"){
+                                                $(this).addClass('active');
+                                            }
+                                        });
+                                   //     drawBreadCrumb1();
+                                   //isUserTypeSuperAdmin();
+
+                                    }   
+                    
+                        </script>
+                        <div class="col-md-5">
+
+                            </div>
+                        </div>
+                        
+                    </div>
+                    <div class="widget-toolbox padding-8 clearfix">
+                       <div id="tableFooterLeft" class="pull-left"></div>
+                       <div id="tableFooterRight" class="pull-right"></div>
+                    </div>
+                   
+                    
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/client/htmls/private/ajax/Settings/OctopusConfigList.html b/client/htmls/private/ajax/Settings/OctopusConfigList.html
new file mode 100644
index 000000000..0e45c5cc6
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/OctopusConfigList.html
@@ -0,0 +1,151 @@
+
+<script>
+    $(".login-info").hide();
+    
+</script>
+
+<style>
+    .rowCustomStyle {
+        height: 34px;
+        font-weight: bold;
+    }
+</style>
+
+<div class="row">
+    <div class="col-md-12">
+        <div class="col-md-12">
+
+            <div class="widget-box">
+                <div class="widget-header">
+                    <h5 class="widget-title" style="color:#4e5964;">
+                    <strong>Octopus Deploy</strong>
+                    </h5>
+                    <div class="widget-toolbar no-border">
+                        <div>
+                            <a class="btn btn-minier btn-primary" id="refreshpage" href="#ajax/Settings/DockerTemplatesList.html" style="display:none">
+                                <i class="ace-icon ace-icon fa fa-refresh bigger-110"></i>
+                            </a>                     
+                            <a id="newOct" class="btn btn-minier btn-primary" href="index.html#ajax/Settings/CreateOctopusConfig.html?new">
+                                <i class="ace-icon ace-icon fa fa-plus bigger-110"></i>
+                                New
+                            </a>                                                
+                        </div>
+                    </div>
+                                            
+                </div>
+                <div class="widget-body">
+                    <div class="widget-main widgetHeight">
+                        <div class="col-md-12" style="padding-left:0px; padding-right:0px;">
+                            <table id="templateTable" class="hidden" cellpadding="5px" width="100%">
+                                <thead>
+                                    <tr class="rowCustomStyle">
+                                        <td>Reference Name</td>
+                                        <td>Octopus Location (URL)</td>
+                                        <!-- <td>Bitbucket Username</td> -->
+                                        <td>Organization</td>
+                                        <td>Action</td>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr class="hidden rowtemplate">
+                                        <td datafield="octopusname"></td>
+                                        <td datafield="octopusurl"></td>
+                                        <!-- <td datafield="bitbucketusername"></td> -->
+                                        <td datafield="orgname"></td>
+                                       <td>
+                                            <div class="btn-group tableactionWidth">
+                                                <a class="btn btn-xs btn-info pull-left" title="Edit">
+                                                    <i class="ace-icon fa fa-pencil bigger-120"></i>
+                                                </a>
+                                                <button class="btn btn-xs btn-danger pull-left" value="Remove" title="Delete"><i class="ace-icon fa fa-trash-o bigger-120"></i></button>
+                                                
+                                            </div>
+                                        </td>
+
+                                    </tr>
+                                </tbody>
+                            </table>
+                                <table id="envtable" class="table table-striped table-bordered table-hover dataTable no-footer" cellpadding="5px" width="100%" style="text-align:center";>
+                                    <thead>
+                                        <tr class="rowCustomStyle">
+                                           <td>Reference Name</td>
+                                            <td>Octopus Location (URL)</td>
+                                            <!-- <td>Bitbucket Username</td> -->
+                                            <td>Organization</td>
+                                            <td>Action</td>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        
+                                       
+                                    </tbody>
+                                    
+                                </table> 
+                            
+                             <script>
+                                    $(document).ready(function () {
+                                        $('select').select2();
+                                        startup(); 
+                                    });
+
+                                function isUserTypeSuperAdmin(){
+                                    $.get('/d4dMasters/loggedInUser',function(data){
+                                      if(!data.isSuperAdmin){
+                                      $('#newOct').attr('disabled','disabled');
+                                      }
+                                    });
+                                   
+                                }
+
+                                    function startup() {
+                                       
+                                        //setting the addnew button to launch popup
+                                        $("#addnewitem").attr('data-toggle', 'modal');
+
+                                        CreateTableFromJsonNew(28,'octopusname' , 'CreateOctopusConfig.html'); //7 is for users
+                                        var tab = 'envtable';
+                                        $('#' + tab).dataTable({
+                                            "pagingType": "full_numbers"
+                                        });
+                                        $('#' + tab + '_info').detach().appendTo('#tableFooterLeft'); 
+                                        $('#' + tab + '_paginate').detach().appendTo('#tableFooterRight');
+                                        $('#' + tab + '_filter').detach().appendTo('#envtable_tools1');
+                                        $('#' + tab + '_length').detach().appendTo('#envtable_tools2');
+
+                                        //Force opening the left navigation menu
+                                        if ($('#navSettings').is(":visible") == false) {
+                                            $('#navSettings').css("display", '');
+                                            $('#navSettings > ul > li').first().addClass('open');
+                                            $('#navSettings > ul > li > ul').css("display", "none");
+                                            $('#navSettings > ul > li > ul').first().css("display", "block");
+                                        }
+                                        //redrawing the breadcrumb and selecting the tree
+                                        $('#Settings  li').removeClass('active');
+                                        $('#Settings  li').each(function () {
+                                            if ($(this).text().trim() == "Octopus"){
+                                                $(this).addClass('active');
+                                            }
+                                        });
+                                   //     drawBreadCrumb1();
+                                   //isUserTypeSuperAdmin();
+
+                                    }   
+                    
+                        </script>
+                        <div class="col-md-5">
+
+                            </div>
+                        </div>
+                        
+                    </div>
+                    <div class="widget-toolbox padding-8 clearfix">
+                       <div id="tableFooterLeft" class="pull-left"></div>
+                       <div id="tableFooterRight" class="pull-right"></div>
+                    </div>
+                   
+                    
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/client/htmls/private/css/catalyst.css b/client/htmls/private/css/catalyst.css
index b79229fdb..113e4a255 100644
--- a/client/htmls/private/css/catalyst.css
+++ b/client/htmls/private/css/catalyst.css
@@ -4598,7 +4598,19 @@ input:focus, select:focus, textarea:focus {
     border: none;
     width: auto !important;
 }
-
+.zoom{
+    height: 117%;
+    margin-left: -254px;
+    margin-top: -111px;
+    width: 118% !important;
+}
+.trackzoomicondiv{
+    color: rgb(0, 0, 0);
+    left: 343px;
+    position: absolute;
+    top: 63px;
+    cursor: pointer;
+}
 #createProvider .marginbottom {
     margin-bottom: 10px;
 }
diff --git a/client/htmls/private/css/catalyst.css.bak b/client/htmls/private/css/catalyst.css.bak
new file mode 100644
index 000000000..b79229fdb
--- /dev/null
+++ b/client/htmls/private/css/catalyst.css.bak
@@ -0,0 +1,4675 @@
+.tableMoreInfo {
+    position: relative;
+    left: 32%;
+}
+.legendCustom {
+    border: 0 none !important;
+    padding: 0 !important;
+    width: auto !important;
+    margin-bottom: 0 !important;
+    font-size: 15px !important;
+    color: #666 !important;
+}
+.fieldsetCustom {
+    border: 1px solid #dddddd !important;
+    margin: 0 2px !important;
+    padding: 0.35em 0.625em 0.75em !important;
+}
+.updateupgrade {
+    background: url("../img/updateupgrade.png");
+    background-repeat: no-repeat;
+    height: 24px;
+    padding-left: 36px !important;
+    padding-top: 6px !important;
+    background-position: 4px 2px;
+    font-size: 12px;
+}
+.carousel-inner {
+    overflow: auto !important;
+    min-height: 400px !important;
+}
+.showmenuAppTaskAnchor {
+    background-color: #ffffff;
+    border-color: #40baf1 !important;
+    background-repeat: no-repeat;
+    float: right;
+    border-radius: 50% !important;
+    height: 26px;
+    width: 26px;
+    margin-left: 10px;
+    margin-top: 4px;
+    margin-right: 6px;
+}
+.showmenuAppTaskAnchorI {
+    color: #40baf1 ! important;
+    font-size: 16px;
+    margin-top: 3px;
+}
+.menuAppLinkSpan {
+    color: rgb(44, 55, 66);
+    font-weight: bold;
+    padding: 10px;
+    font-size: 11px;
+}
+.menuTaskSpan {
+    color: rgb(44, 55, 66);
+    font-weight: bold;
+    padding: 10px;
+    font-size: 11px;
+}
+.paddingleft32 {
+    padding-left: 32px;
+}
+.fontsize11 {
+    font-size: 11px;
+}
+.menuAppTask {
+    position: absolute;
+    width: 150px;
+    z-index: 1;
+    margin-top: 15px;
+    background: none repeat scroll 0 0 #ffffff !important;
+    border: 2px solid #40baf1;
+    min-height: 100px;
+    box-shadow: 0 4px 10px rgba(0, 0, 0, 0.3);
+}
+.menuAppTask:after,
+.menuAppTask:before {
+    bottom: 100%;
+    left: 88%;
+    border: solid transparent;
+    content: " ";
+    height: 0;
+    width: 0;
+    position: absolute;
+    pointer-events: none;
+}
+.menuAppTask:after {
+    border-color: rgba(136, 183, 213, 0);
+    border-bottom-color: #ffffff;
+    border-width: 15px;
+    margin-left: -15px;
+}
+.menuAppTask:before {
+    border-color: rgba(194, 225, 245, 0);
+    border-bottom-color: #40baf1;
+    border-width: 18px;
+    margin-left: -18px;
+}
+#tasksLists_length {
+    display: none;
+}
+.assignedRunlists {
+    border: 1px solid #dddddd;
+    list-style: none outside none;
+    height: 150px;
+    overflow-y: auto;
+    margin-bottom: 10px !important;
+}
+.assignedRunlistTable {
+    margin-top: 5px;
+    text-decoration: none;
+    margin-left: 3px;
+}
+.applicationNameCSS {
+    text-align: center;
+    width: 30px;
+    font-weight: bold;
+    color: white;
+}
+.margin-left40per {
+    margin-left: 40% !important;
+}
+.pointereventsDisabled {
+    pointer-events: none;
+}
+.pointereventsEnabled {
+    pointer-events: visible;
+}
+.loadingcookbookandroles {
+    float: right !important;
+    margin-right: 10px !important;
+}
+.loadCookbookroleslabel {
+    font-weight: bold;
+    height: 36px;
+}
+.loadingContainerGap {
+    height: 20px;
+}
+.loadingContainerimageCSS {
+    height: 50px;
+    width: 50px;
+    margin-top: 10%;
+    margin-bottom: 10%;
+}
+.loadingContainerimageInspectCSS {
+    height: 50px;
+    width: 50px;
+}
+.loadingerrorMsgContainerCSS {
+    font-size: 14px;
+    height: 100px;
+    padding-top: 10px;
+    text-align: center;
+}
+.footerfixed {
+    bottom: 0px;
+    position: fixed;
+}
+.bordermargintop0 {
+    border-top: 0px !important;
+    margin-top: 0px !important;
+}
+.padding10 {
+    padding: 10px !important;
+}
+.selectedNodesTaskCSS {
+    border: 1px solid #dddddd;
+    list-style: none outside none;
+    height: 153px;
+    overflow-y: auto;
+    margin-top: 5px!important;
+}
+.selectedNodesJenkinsTaskCSS {
+    border: 1px solid #dddddd;
+    list-style: none outside none;
+    height: 94px;
+    overflow-y: auto;
+    margin-top: 5px!important;
+}
+.selectedNodesCustomTaskCSS {
+    border: 1px solid #dddddd;
+    list-style: none outside none;
+    height: 200px;
+    overflow-y: auto;
+}
+.editAttributesBtnCSS {
+    padding: 0px 4px !important;
+    margin-left: 3px !important;
+    border-radius: 5px !important;
+}
+.bordersolidgrey {
+    border: 1px solid #ddd;
+}
+.divtablemarginpadding {
+    margin-left: 15px !important;
+    padding-top: 15px !important;
+}
+.margin0 {
+    margin: 0px !important;
+}
+.margin15 {
+    margin: 15px !important;
+}
+.margintop15 {
+    margin-top: 15px !important;
+}
+.margintop20 {
+    margin-top: 20px !important;
+}
+.margintop35 {
+    margin-top: 35px !important;
+}
+.margintop-56 {
+    margin-top: -56px !important;
+}
+.marginleft15 {
+    margin-left: 15px !important;
+}
+.marginbottom4 {
+    margin-bottom: 4px !important;
+}
+.searchCookbooksRolesLabel {
+    width: 80%;
+    margin-bottom: 8px !important;
+}
+.searchTaskLabel {
+    width: 80%;
+    margin-bottom: 8px !important;
+}
+.runlistLabel {
+    font-size: 16px;
+    margin-bottom: 20px !important;
+}
+.selectCookbooksandRecipesdiv {
+    width: 80%;
+}
+.selectTasksdiv {
+    width: 80%;
+}
+.selectCookbooksandRecipes {
+    height: 250px !important;
+    width: 100% !important;
+    margin-bottom: 10px !important;
+    border-width: 1px 1px 1px 2px;
+    border-style: solid;
+    border-color: #ccc !important;
+}
+.selectavailbleTask {
+    height: 250px !important;
+    width: 100% !important;
+    margin-bottom: 10px !important;
+    border-width: 1px 1px 1px 2px;
+    border-style: solid;
+    border-color: #ccc !important;
+}
+.cookbook {
+    background: url("../img/cookbook.png");
+    background-repeat: no-repeat;
+    height: 24px;
+    padding-left: 36px !important;
+    padding-top: 6px !important;
+    background-position: 4px 2px;
+    font-size: 12px;
+}
+.roles {
+    background: url("../img/recipe.png");
+    background-repeat: no-repeat;
+    height: 24px;
+    padding-left: 34px !important;
+    padding-top: 6px !important;
+    background-position: 4px 2px;
+    font-size: 12px;
+}
+.runlistTemplate {
+    background: url("../img/recipe.png");
+    background-repeat: no-repeat;
+    height: 24px;
+    padding-left: 34px !important;
+    padding-top: 6px !important;
+    background-position: 4px 2px;
+    font-size: 12px;
+}
+.taskimg {
+    background: url("../img/tasksmall.png");
+    background-repeat: no-repeat;
+    height: 24px;
+    padding-left: 36px !important;
+    padding-top: 6px !important;
+    background-position: 4px 2px;
+    font-size: 12px;
+}
+.taskimgchef {
+    background: url("../img/chef.png");
+    background-repeat: no-repeat;
+    height: 24px;
+    padding-left: 36px !important;
+    padding-top: 6px !important;
+    background-position: 4px 3px;
+    font-size: 12px;
+    background-size: 24px auto;
+}
+.taskimgpuppet {
+    background: url("../img/puppeticon.png");
+    background-repeat: no-repeat;
+    height: 24px;
+    padding-left: 36px !important;
+    padding-top: 6px !important;
+    background-position: 4px 3px;
+    font-size: 12px;
+    background-size: 24px auto;
+}
+.taskimgjenkins {
+    background: url("../img/jenkins.png");
+    background-repeat: no-repeat;
+    height: 24px;
+    padding-left: 36px !important;
+    padding-top: 6px !important;
+    background-position: 4px 2px;
+    font-size: 12px;
+    background-size: 18px auto;
+}
+.marginleft12 {
+    margin-left: 12px;
+}
+.marginleft5 {
+    margin-left: 5% !important;
+}
+.fontsize13 {
+    font-size: 13px !important;
+}
+.anchorAdd {
+    border-radius: 50% !important;
+    height: 32px;
+    width: 32px;
+    margin-bottom: 15px !important;
+}
+.anchorAddi {
+    font-size: 14px !important;
+}
+.anchorRemove {
+    border-radius: 50% !important;
+    height: 32px;
+    margin-top: 15px !important;
+    width: 32px;
+}
+.anchorRemovei {
+    font-size: 14px !important;
+}
+.anchorUp {
+    border-radius: 50% !important;
+    height: 32px;
+    width: 32px;
+    margin-bottom: 15px !important;
+}
+.anchorUpi {
+    font-size: 14px !important;
+}
+.anchorDown {
+    border-radius: 50% !important;
+    height: 32px;
+    margin-top: 15px !important;
+    width: 32px;
+}
+.anchorDowni {
+    font-size: 14px !important;
+}
+.font-size18 {
+    font-size: 18px !important;
+    margin-top: 4px;
+}
+.indicatorStopped {
+    background-image: url('../img/indicator_stopped.png');
+    background-repeat: no-repeat;
+}
+.indicatorStarted {
+    background-image: url('../img/indicator_started.png');
+    background-repeat: no-repeat;
+}
+.appcardDropdown {
+    -moz-border-bottom-colors: none;
+    -moz-border-left-colors: none;
+    -moz-border-right-colors: none;
+    -moz-border-top-colors: none;
+    background: none repeat scroll 0 0 rgb(255, 255, 255);
+    border-color: rgb(255, 255, 255) rgb(255, 255, 255) #ddd;
+    border-image: none;
+    border-style: solid;
+    border-width: 1px 1px 2px;
+    color: #666;
+    float: right;
+    font-size: 11px;
+}
+.paddingtopbottom10 {
+    padding:6px 0;
+}
+.width50borderradius50 {
+    width: 50%;
+    padding: 4px 0 !important;
+    border-radius: 50% !important;
+}
+.width40borderradius50Deploy {
+    width: 40%;
+    padding: 4px 0 !important;
+    border-radius: 50% !important;
+}
+.btn-black {
+    background-color: #2c3638;
+    color: white;
+}
+.btn-black:hover,
+.btn-black:focus {
+    background-color: #2c3638;
+    color: white;
+}
+.btn-black:active {
+    background-color: #2c3638;
+    color: white;
+}
+.width100 {
+    width: 100%;
+    padding: 4px 0 !important;
+    box-shadow: 0 0px 0 rgba(0, 0, 0, 0.05) inset !important;
+}
+.applogslinksBackground {
+    background-color: #e7e7e7;
+    height: 97%;
+    margin-left: 2px;
+    width: 98%;
+    padding-top: 20px;
+    text-align: center;
+}
+.applogslinksBorder {
+    border-width: 0 0 2px 0;
+    height: 60px;
+}
+.appperflinksBorder {
+    border-width: 0 2px 0 0;
+    height: 60px;
+}
+.codehealthlinksBackground {
+    background-color: #e7e7e7;
+    height: 96%;
+    margin-top: 2px;
+    width: 98%;
+    padding-top: 20px;
+    text-align: center;
+}
+.codehealthlinksBorder {
+    border-width: 2px 2px 0 0;
+    height: 60px;
+    margin-top: -2px;
+}
+.uiperflinksBackground {
+    background-color: #e7e7e7;
+    height: 94%;
+    width: 98%;
+    padding-top: 20px;
+    text-align: center;
+}
+.uiperflinksBorder {
+    border-width: 0;
+    height: 60px;
+    margin-top: 2px;
+}
+.ApplinksColor {
+    color: #3276b1;
+    font-size: 11px;
+}
+.paddingleftright0 {
+    padding-left: 0px !important;
+    padding-right: 0px !important;
+}
+.paddingleft0 {
+    padding-left: 0px !important;
+}
+.paddingright0 {
+    padding-right: 0px !important;
+}
+.paddingleftright4 {
+    padding-left: 4px;
+    padding-right: 4px;
+}
+.padding7 {
+    padding: 7px;
+}
+.font-size12 {
+    font-size: 12px !important;
+}
+.btnBuild {
+    width: 100%;
+    font-size: 10px;
+    padding: 1px !important;
+}
+.btnDeploy {
+    width: 100%;
+    font-size: 10px;
+    padding: 1px !important;
+}
+.btnTest {
+    width: 100%;
+    font-size: 10px;
+    padding: 1px !important;
+}
+.greenBuild {
+    width: 64px;
+    font-size: 10px;
+}
+.redBuild {
+    width: 64px;
+    font-size: 10px;
+}
+.greenDeploy {
+    width: 74px;
+    font-size: 10px;
+}
+.redDeploy {
+    width: 74px;
+    font-size: 10px;
+}
+.greenTest {
+    width: 56px;
+    font-size: 10px;
+    padding-left: 4px !important;
+}
+.redTest {
+    width: 56px;
+    font-size: 10px;
+    padding-left: 4px;
+}
+.appCardBorder {
+    border-color: white;
+    border-style: solid;
+}
+.btn-green {
+    background-color: #04B404;
+}
+.btn-green:hover,
+.btn-green:focus {
+    background-color: #04B404;
+}
+.btn-green:active {
+    background-color: #04B404;
+}
+.btn-red {
+    background-color: red;
+}
+.btn-red:hover,
+.btn-red:focus {
+    background-color: red;
+}
+.btn-red:active {
+    background-color: red;
+}
+.btn-white {
+    background-color: #ffffff;
+}
+.btn-white:hover,
+.btn-white:focus {
+    background-color: #ffffff;
+}
+.btn-white:active {
+    background-color: #ffffff;
+}
+.builLogsContainer {
+    height: 400px;
+    overflow-x: hidden;
+    overflow-y: auto;
+}
+.appCardLoadingContainer {
+    display: none;
+}
+.light-grey {
+    background-color: #d0d0d0 !important;
+}
+.role-Selectedcard-app {
+    border: 1px solid #40baf1 !important;
+    border-radius: 12px;
+    box-shadow: 0 4px 10px rgba(0, 0, 0, .3);
+}
+.minheight130 {
+    min-height: 130px;
+    padding-left: 10px;
+}
+.minheight120 {
+    min-height: 120px;
+}
+@media (min-width: 992px) {
+    .modal-lg {
+        width: 900px;
+    }
+}
+.padding-left0 {
+    padding-left: 0px !important;
+}
+.sshShellBtn {
+    background-image: url('../img/galleryIcons/sshIcon.png');
+    background-repeat: no-repeat;
+    float: left;
+    height: 28px;
+    width: 32px;
+}
+.rdpIcondisable {
+    background-image: url('../img/galleryIcons/rsz_rdp.png');
+    background-repeat: no-repeat;
+    float: left;
+    height: 30px;
+    width: 100%;
+    margin-top: 2px;
+}
+.actionbuttonStartdisable {
+    background-image: url('../img/galleryIcons/rsz_start_icon.png');
+    background-repeat: no-repeat;
+    float: left;
+    height: 27px;
+    width: 100%;
+    margin-top: 0px;
+}
+.sshIcondisable {
+    background-image: url('../img/galleryIcons/rsz_sshicon.png');
+    background-repeat: no-repeat;
+    float: left;
+    height: 28px;
+    width: 32px;
+}
+.actionbuttonChefClientRundisable {
+    background-image: url("../img/galleryIcons/rsz_chefimport.png");
+    background-repeat: no-repeat;
+    float: left;
+    height: 28px;
+    margin-left: 4px;
+    width: 28px;
+}
+#customRow .actionbuttonChefClientRundisable {
+    position: relative;
+    left: 32%;
+}
+.actionbuttonShutdowndisable {
+    background-image: url('../img/galleryIcons/rsz_shut_down.png');
+    background-repeat: no-repeat;
+    float: left;
+    height: 27px;
+    width: 100%;
+}
+.margin-top40 {
+    margin-top: 40px !important;
+}
+.chefClientRunlistImageCP {
+    background-image: url('../img/galleryIcons/Chefimport.png');
+    background-repeat: no-repeat;
+    float: left;
+    height: 28px;
+    width: 30px;
+    margin-top: 1px;
+}
+.puppetClientRunlistImageCP {
+    background-repeat: no-repeat;
+    float: left;
+    height: 28px;
+    width: 30px;
+    margin-top: 1px;
+}
+.txt-color-white {
+    color: #fff!important;
+}
+.border-color {
+    border: 1px solid #e5e5e5;
+}
+.margintopbottom {
+    margin-top: 4px !important;
+    margin-bottom: 4px !important;
+}
+.hidden-menu .minifyme,
+.minified #tree {
+    display: none;
+}
+.redSpan {
+    color: red;
+}
+.jarviswidget {
+    margin: 0 0 30px;
+    position: relative;
+    -khtml-border-radius: 0;
+    border-radius: 0;
+    padding: 0;
+}
+.jarviswidget>div {
+    float: left;
+    width: 100%;
+    position: relative;
+    font-size: 13px;
+    -khtml-border-radius: 0;
+    border-radius: 0;
+    margin: 0;
+    border-width: 0px 0px 0px;
+    border-style: solid;
+    border-top: 0;
+    border-right-color: #CCC!important;
+    border-bottom-color: #CCC!important;
+    border-left-color: #CCC!important;
+    padding: 13px 13px 0;
+}
+.jarviswidget .widget-body {
+    min-height: 100px;
+    position: relative;
+    padding-bottom: 13px;
+}
+.widget-toolbar.no-border {
+    border-left: 0;
+}
+.widget-body.no-padding {
+    margin: -13px -13px 0;
+}
+.jarviswidget>div {
+    background-color: #fff!important;
+}
+.clearfix:after,
+.clearfix:before,
+.inner-spacer:after,
+.inner-spacer:before,
+.jarviswidget-editbox:after,
+.jarviswidget-editbox:before,
+.jarviswidget:after,
+.jarviswidget:before,
+.jarviswidget>div:after,
+.jarviswidget>div:before {
+    content: "\0020";
+    display: block;
+    height: 0;
+    overflow: hidden;
+    font-size: 0;
+    line-height: 0;
+    visibility: hidden;
+}
+.clearfix:after,
+.inner-spacer:after,
+.jarviswidget-editbox:after,
+.jarviswidget:after,
+.jarviswidget>div:after {
+    clear: both;
+}
+.clearfix,
+.inner-spacer:after,
+.jarviswidget,
+.jarviswidget-editbox,
+.jarviswidget>div {
+    zoom: 1;
+}
+.widget-toolbar {
+    display: inline-block;
+    float: right;
+    width: auto;
+    height: 32px;
+    line-height: 32px;
+    position: relative;
+    border-left: 1px solid rgba(0, 0, 0, .09);
+    cursor: pointer;
+    padding: 0 8px;
+    text-align: center;
+}
+.widget-toolbar>:first-child {
+    text-align: left;
+}
+@-webkit-keyframes loading {
+    0% {
+        background-position: 0 -400px;
+    }
+    100% {
+        background-position: -7px -400px;
+    }
+}
+@-ms-keyframes loading {
+    0% {
+        background-position: 0 -400px;
+    }
+    100% {
+        background-position: -7px -400px;
+    }
+}
+@keyframes loading {
+    0% {
+        background-position: 0 -400px;
+    }
+    100% {
+        background-position: -7px -400px;
+    }
+}
+div.dataTables_length {
+    position: absolute;
+    right: 13px;
+    top: -38px;
+}
+div.dataTables_length select {
+    width: 60px;
+    padding: 3px;
+    font-size: 13px;
+}
+div.dataTables_filter {
+    position: absolute;
+    left: 10px;
+    top: -38px;
+}
+div.dataTables_filter input {
+    padding: 2px 8px;
+    font-size: 13px;
+}
+@media screen and (max-width: 450px) and (max-width: 767px) {
+    #divSmallBoxes {
+        position: fixed;
+        width: 90%;
+        right: 0;
+        top: 0;
+    }
+}
+a:active,
+a:focus,
+a:hover,
+button,
+button:active,
+button:focus,
+embed,
+input::-moz-focus-inner,
+object {
+    outline: 0;
+}
+h1,
+h2,
+h3,
+h4 {
+    margin: 0;
+    font-family: "Open Sans", Arial, Helvetica, Sans-Serif;
+    font-weight: 300;
+}
+.page-title {
+    margin: 12px 0 28px;
+}
+.page-title span {
+    font-size: 16px;
+    color: #333;
+    display: inline-block;
+    vertical-align: 1px;
+}
+label {
+    font-weight: 400;
+}
+:focus {
+    outline: 0!important;
+}
+.uneditable-input:focus,
+input[type=color]:focus,
+input[type=date]:focus,
+input[type=datetime-local]:focus,
+input[type=datetime]:focus,
+input[type=email]:focus,
+input[type=month]:focus,
+input[type=number]:focus,
+input[type=password]:focus,
+input[type=search]:focus,
+input[type=tel]:focus,
+input[type=text]:focus,
+input[type=time]:focus,
+input[type=url]:focus,
+input[type=week]:focus,
+select:focus,
+textarea:focus {
+    outline: 0;
+    outline: thin dotted \9;
+    -webkit-box-shadow: none!important;
+    box-shadow: none!important;
+}
+.form-control,
+.form-controlSelect,
+.input-lg,
+.input-sm,
+.input-xs {
+    border-radius: 0!important;
+}
+.input-xs {
+    height: 24px;
+    padding: 2px 10px;
+    font-size: 11px;
+    line-height: 1.5;
+}
+.btn-xs {
+    padding: 1px 5px;
+}
+.btn-sm {
+    padding: 6px 10px 5px;
+}
+.btn-lg {
+    padding: 10px 16px;
+}
+.no-space {
+    margin: 0;
+}
+.no-space>[class*=col-] {
+    margin: 0!important;
+    padding-right: 0;
+    padding-left: 0;
+}
+#content {
+    padding: 7px 10px;
+    position: relative;
+    left: 0;
+    height: 91.6%!important;
+    height: calc(100% - 98px) !important;
+    overflow-y: auto;
+    overflow-x: hidden;
+}
+body.container {
+    position: relative;
+    padding: 0;
+    border-left: 1px solid #bfbfbf;
+    border-right: 1px solid #bfbfbf;
+    -webkit-box-shadow: 0 2px 70px rgba(0, 0, 0, .45);
+    box-shadow: 0 2px 70px rgba(0, 0, 0, .45);
+}
+.no-content-padding {
+    margin: -10px -14px 0 -14px;
+}
+.no-padding {
+    padding: 0!important;
+}
+.no-padding>pre {
+    margin: 30px;
+}
+.no-padding-bottom {
+    padding-bottom: 0!important;
+}
+.padding-5 {
+    padding: 5px!important;
+}
+.padding-7 {
+    padding: 7px!important;
+}
+.padding-10 {
+    padding: 10px!important;
+}
+.padding-top-10 {
+    padding-top: 10px!important;
+}
+h1 {
+    letter-spacing: -1px;
+    font-size: 24px;
+    margin: 10px 0;
+}
+h1 small {
+    font-size: 18px;
+    font-weight: 300;
+    letter-spacing: -1px;
+}
+.lead {
+    font-size: 19px;
+}
+h2 {
+    letter-spacing: -1px;
+    font-size: 22px;
+    margin: 20px 0;
+    line-height: normal;
+}
+h3 {
+    display: block;
+    font-size: 19px;
+    font-weight: 400;
+    margin: 20px 0;
+    line-height: normal;
+}
+h4 {
+    line-height: normal;
+}
+h5 {
+    font-size: 17px;
+    font-weight: 300;
+    margin: 10px 0;
+    line-height: normal;
+}
+h6 {
+    font-size: 15px;
+    margin: 10px 0;
+    font-weight: 700;
+    line-height: normal;
+}
+.text-align-center,
+.text-center {
+    text-align: center!important;
+}
+.bordered {
+    border: 1px solid rgba(0, 0, 0, .2);
+}
+.bordered:hover {
+    border: 1px solid rgba(0, 0, 0, .4);
+}
+#left-panel {
+    position: absolute;
+    z-index: 1;
+    width: 254px;
+    display: block;
+    background: #2c3638;
+    background: -webkit-gradient(linear, left top, right top, color-stop(99%, #2c3638), color-stop(100%, #2c3638));
+    background: -webkit-linear-gradient(left, #2c3638 99%, #2c3638 100%);
+    background: -webkit-gradient(linear, top left, top right, from(#2c3638), to(#2c3638));
+    background: linear-gradient(to right, #2c3638 99%, #2c3638 100%);
+    height: 91.4%!important;
+    float: left;
+}
+#main {
+    display: block;
+    margin-left: 254px;
+    height: 91.6%!important;
+}
+#ribbon {
+    min-height: 6%;
+    background: #474544;
+    padding: 0 13px;
+    position: relative;
+}
+@media (min-width: 1600px) {
+    #ribbon {
+        min-height: 4%;
+        background: #474544;
+        padding: 0 13px;
+        position: relative;
+    }
+}
+#ribbon .breadcrumb {
+    display: inline-block;
+    margin: 0;
+    padding: 11px 34px 11px 0!important;
+    background: 0 0;
+    vertical-align: top;
+}
+#ribbon .breadcrumb,
+#ribbon .breadcrumb a {
+    color: #BBB!important;
+    text-decoration: none!Important;
+}
+#ribbon .breadcrumb li:last-child,
+#ribbon .breadcrumb>.active {
+    color: #E4E4E4;
+}
+nav ul li a:active {
+    background: #616161!important;
+}
+nav ul .active>a {
+    color: #fff!important;
+    position: relative;
+}
+nav ul li.active>a:before {
+    font-family: FontAwesome;
+    display: block;
+    height: 27px;
+    line-height: normal;
+    width: 27px;
+    position: absolute;
+    right: -21px;
+    font-size: 20px;
+    color: #eee;
+}
+nav ul li.active.open>a:before {
+    content: ""
+}
+nav ul li a {
+    line-height: normal;
+    font-size: 14px;
+    padding: 12px 10px 12px 11px;
+    color: #a8a8a8;
+    display: block;
+    font-weight: 400;
+    text-decoration: none!important;
+}
+nav ul li a:focus {
+    color: #c9c9c9;
+}
+nav ul li a:hover {
+    color: #fff;
+    text-decoration: none;
+}
+nav ul span.menu-item-parent {
+    display: inline-block;
+    margin: 0;
+    padding: 0;
+}
+nav ul li.open>a,
+nav ul li.open>a b {
+    color: #fff!important;
+}
+nav>ul>li>a>i {
+    margin-right: 5px;
+    width: 15px;
+    display: inline-block;
+    text-align: center;
+    position: relative;
+}
+nav ul li li {
+    border-bottom: 0;
+    position: relative;
+}
+nav>ul>li>ul::before {
+    content: "";
+    display: block;
+    position: absolute;
+    z-index: 1;
+    left: 23px;
+    top: 0;
+    bottom: 0;
+    border-left: 1px solid #7A7A7A;
+}
+nav>ul ul li::before {
+    content: "";
+    display: block;
+    position: absolute;
+    width: 8px;
+    left: 23px;
+    top: 16px;
+    border-top: 1px solid #7A7A7A;
+    z-index: 1;
+}
+nav>ul ul ul li::before {
+    content: "";
+    display: block;
+    position: absolute;
+    width: 18px;
+    left: 10px;
+    top: 17px;
+    border-top: 1px solid transparent;
+}
+nav>ul ul li a i {
+    font-size: 14px!important;
+    width: 18px!important;
+    text-align: center!important;
+}
+nav>ul>li:hover>ul::before,
+nav>ul>li:hover>ul>li::before {
+    border-color: #ACACAC!important;
+}
+nav ul ul {
+    margin: 0;
+    display: none;
+    background: rgba(69, 69, 69, .6);
+    padding: 7px 0;
+}
+nav ul ul ul {
+    background: 0 0;
+    padding: 0;
+}
+nav ul ul li {
+    margin: 0;
+    padding: 0;
+}
+nav ul ul li>a {
+    padding-left: 42px;
+    font-size: 14px;
+    font-weight: 400;
+    outline: 0;
+}
+nav ul ul li>a:hover {
+    background-color: rgba(69, 69, 69, .8);
+    color: #fff;
+}
+nav ul ul ul li a {
+    color: #bfbfbf;
+    padding: 8px 10px 8px 70px;
+    font-size: 14px;
+}
+nav ul ul ul li a:hover {
+    background-color: #4C4F53;
+    color: #fff;
+}
+nav ul ul ul ul li a {
+    padding-left: 90px;
+}
+nav ul ul b {
+    color: #B3B3B3;
+}
+nav ul ul>li:hover b {
+    color: #D5D9E2;
+}
+.form-control {
+    box-shadow: none!important;
+    -webkit-box-shadow: none!important;
+}
+.form-control:focus {
+    border-color: #66afe9!important;
+    outline: 0;
+}
+.form-controlSelect {
+    box-shadow: none!important;
+    -webkit-box-shadow: none!important;
+}
+.form-controlSelect:focus {
+    border-color: #66afe9!important;
+    outline: 0;
+}
+.form-actions {
+    display: block;
+    padding: 13px 14px 15px;
+    border-top: 1px solid rgba(0, 0, 0, .1);
+    background: rgba(249, 249, 249, .9);
+    margin-left: -13px;
+    margin-right: -13px;
+    margin-bottom: -13px;
+    text-align: right;
+}
+.nav-tabs>li>a>.fa {
+    opacity: .5;
+}
+.nav-tabs>li.active>a .badge,
+.nav-tabs>li.active>a .label,
+.nav-tabs>li.active>a>.fa {
+    opacity: 1;
+}
+.nav-tabs>li>a {
+    border-radius: 0;
+    color: #333;
+}
+.nav-tabs>li.active>a {
+    -webkit-box-shadow: 0 -2px 0 #57889c;
+    box-shadow: 0 -2px 0 #40baf1;
+    border-top-width: 0!important;
+    margin-top: 1px!important;
+    font-weight: 700;
+}
+.tabs-left>.nav-pills,
+.tabs-left>.nav-tabs {
+    float: left;
+    margin-right: 19px;
+    border-right: 1px solid #ddd;
+}
+.tabs-below>.nav-tabs,
+.tabs-left>.nav-tabs,
+.tabs-right>.nav-tabs {
+    border-bottom: 0;
+}
+.pill-content>.pill-pane,
+.tab-content>.tab-pane {
+    display: none;
+}
+.pill-content>.active,
+.tab-content>.active {
+    display: block;
+}
+.nav-tabs.bordered+.tab-content {
+    border: 1px solid #ddd;
+    border-top: 0;
+}
+.btn,
+a:link,
+button {
+    -webkit-tap-highlight-color: rgba(169, 3, 41, .5);
+}
+#logo-group *,
+.tree-view,
+.tree-view *,
+.minified .menu-item-parent {
+    -webkit-box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+}
+.tree-view {
+    display: block;
+    font-size: 12px;
+    min-height: 4%;
+    line-height: 39px;
+    color: #fff;
+    border: solid transparent;
+    border-width: 1px 0;
+    -webkit-box-shadow: inset 1px 1px 0 rgba(0, 0, 0, .1), inset 0 -1px 0 rgba(0, 0, 0, .07);
+    box-shadow: inset 1px 1px 0 rgba(0, 0, 0, .1), inset 0 -1px 0 rgba(0, 0, 0, .07);
+    width: 100%;
+    margin: 0!important;
+    border-bottom: 1px solid #525151;
+}
+.tree-view a,
+.tree-view strong {
+    text-transform: capitalize;
+    font-size: 14px;
+    display: inline-block;
+    color: #A8A8A8;
+    text-decoration: none;
+}
+.tree-view a:hover,
+.tree-view strong {
+    color: #fff;
+}
+.tree-view span {
+    height: 41px;
+    display: block;
+    padding: 0 10px;
+    border-bottom: 1px solid #1A1817;
+}
+.pull-right {
+    float: right!Important;
+}
+.pull-left {
+    float: left!Important;
+}
+.disabled {
+    color: #fff;
+}
+.btn {
+    border-radius: 2px;
+    box-shadow: inset 0 -2px 0 rgba(0, 0, 0, .05);
+    -webkit-box-shadow: inset 0 -2px 0 rgba(0, 0, 0, .05);
+}
+.btn:active {
+    position: relative;
+    top: 1px;
+    left: 1px;
+}
+#content,
+#left-panel {
+    -webkit-transition: left .1s ease-out;
+    transition: left .1s ease-out;
+}
+#main {
+    -webkit-transition: all .1s ease-out;
+    transition: all .1s ease-out;
+}
+.btn-header.pull-right {
+    margin-left: 6px;
+}
+@-webkit-keyframes pace-spinner {
+    0% {
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+    100% {
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}
+@-ms-keyframes pace-spinner {
+    0% {
+        -ms-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+    100% {
+        -ms-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}
+@keyframes pace-spinner {
+    0% {
+        -webkit-transform: rotate(0deg);
+        -ms-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+    100% {
+        -webkit-transform: rotate(360deg);
+        -ms-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}
+@media (min-width: 767px) and (max-width: 979px) {
+    #main {
+        margin-left: 220px;
+    }
+    #left-panel {
+        left: 0px;
+        position: absolute;
+        width: 220px;
+    }
+    .minified #left-panel {
+        left: 0;
+    }
+    #hide-menu>:first-child>a {
+        margin-top: 9px;
+        width: 40px;
+    }
+    .btn-header a {
+        margin-top: 9px!important;
+        width: 40px!important;
+    }
+    #hide-menu i {
+        color: #6D6A69;
+        font-size: 100%
+    }
+    .hidden-menu #hide-menu i {
+        color: #fff;
+    }
+    .hidden-menu #left-panel {
+        left: 0;
+    }
+    .hidden-menu #main {
+        position: relative;
+    }
+    .hidden-menu.fixed-ribbon #ribbon {
+        left: 220px;
+    }
+    .fixed-ribbon #ribbon {
+        left: 0;
+    }
+    .header-search>input[type=text] {
+        margin-top: 9px;
+    }
+    #header>div {
+        display: inline-block;
+        vertical-align: middle;
+        height: 1px;
+        float: left;
+    }
+}
+@media (min-width: 768px) and (max-width: 880px) {
+    .btn-header.transparent a {
+        border: 0!important;
+        background: 0 0;
+        margin-left: 0;
+        width: 25px!important;
+        -webkit-box-shadow: none!important;
+        box-shadow: none!important;
+    }
+    .btn-header.transparent a:hover {
+        color: #a90329;
+    }
+    #hide-menu i {
+        color: #6D6A69;
+        font-size: 121%
+    }
+}
+@media (max-width: 767px) {
+    #main {
+        margin-left: 0;
+    }
+    #left-panel {
+        left: -220px;
+    }
+    #content,
+    #ribbon {
+        padding-left: 5px;
+        padding-right: 5px;
+    }
+    #logo {
+        margin-left: 4px;
+    }
+    .left-projects-links {
+        font-size: 12px!important;
+        margin-top: 30px!important;
+    }
+    .btn-header.transparent a {
+        border: 0!important;
+        background: 0 0;
+        margin-left: 0;
+        width: 25px!important;
+        -webkit-box-shadow: none!important;
+        box-shadow: none!important;
+    }
+    .btn-header.transparent a:hover {
+        color: #a90329;
+    }
+    #hide-menu i {
+        color: #6D6A69;
+        font-size: 121%
+    }
+}
+@media only screen and (min-width: 0) and (max-width: 679px) {
+    #main {
+        margin-left: 0;
+    }
+    #left-panel {
+        left: -220px;
+    }
+    #content,
+    #ribbon {
+        padding-left: 5px;
+        padding-right: 5px;
+    }
+    #logo {
+        margin-left: 4px;
+    }
+    #ribbon {
+        border-bottom: 1px solid #CFCFCF;
+        border-top: 1px solid #E6E6E6;
+        background: #F5F5F5;
+    }
+    #ribbon .breadcrumb,
+    #ribbon .breadcrumb a {
+        color: #6D6C6C!important;
+    }
+    #ribbon .breadcrumb li:last-child,
+    #ribbon .breadcrumb>.active {
+        color: #333!important;
+    }
+    .btn-header.transparent a {
+        border: 0!important;
+        background: 0 0;
+        margin-left: 0;
+        width: 25px!important;
+        -webkit-box-shadow: none!important;
+        box-shadow: none!important;
+    }
+    .btn-header.transparent a:hover {
+        color: #a90329;
+    }
+    #hide-menu i {
+        color: #6D6A69;
+        font-size: 121%
+    }
+}
+@media only screen and (min-width: 320px) and (max-width: 479px) {
+    #main {
+        margin-left: 0;
+    }
+    #left-panel {
+        left: -220px;
+    }
+    #content,
+    #ribbon {
+        padding-left: 5px;
+        padding-right: 5px;
+    }
+    #logo {
+        margin-left: 4px;
+    }
+    #ribbon {
+        border-bottom: 1px solid #CFCFCF;
+        border-top: 1px solid #E6E6E6;
+        background: #F5F5F5;
+    }
+    #ribbon .breadcrumb,
+    #ribbon .breadcrumb a {
+        color: #6D6C6C!important;
+    }
+    #ribbon .breadcrumb li:last-child,
+    #ribbon .breadcrumb>.active {
+        color: #333!important;
+    }
+    #logo {
+        width: 135px;
+    }
+    #logo-group {
+        width: 169px!important;
+    }
+    .btn-header.transparent a {
+        border: 0!important;
+        background: 0 0;
+        margin-left: 0;
+        width: 25px!important;
+        -webkit-box-shadow: none!important;
+        box-shadow: none!important;
+    }
+    .btn-header.transparent a:hover {
+        color: #a90329;
+    }
+    #hide-menu>:first-child>a {
+        width: 46px!important;
+    }
+    #hide-menu i {
+        color: #6D6A69;
+        font-size: 121%
+    }
+}
+.minifyme {
+    border-bottom: 1px solid #302F2F;
+    background: #454545;
+    color: #A8A8A8;
+    text-align: center;
+    padding: 0;
+    width: 36px;
+    height: 28px;
+    display: block;
+    position: absolute;
+    right: 0px;
+    border-radius: 5px 0 0 5px;
+    cursor: pointer;
+    margin-top: 5px;
+    font-size: 19px;
+    -webkit-transition: all .1s linear 0s;
+    transition: all .1s linear 0s;
+}
+.minifyme:hover {
+    background: #646464;
+    color: #E4E4E4;
+    right: 0;
+}
+.minified .minifyme {
+    right: 0;
+    color: #A8A8A8;
+    position: relative;
+    border-radius: 0;
+    margin: 0;
+    height: 34px;
+    font-size: 23px;
+}
+.minified .minifyme .fa:before {
+    content: "\f0a9"
+}
+.minified #main {
+    margin-left: 38px;
+}
+/*Added for aside minimization*/
+
+.minified #left-panel {
+    width: 38px !important;
+}
+.minified .hiddencollapse {
+    display: none !important;
+}
+.minified #left-panel,
+.minified nav>ul>li {
+    overflow: visible;
+}
+.minified nav>ul>ul {
+    min-height: 100px!important;
+    max-height: 180px!important;
+    overflow-y: scroll;
+    overflow-x: hidden;
+    background: #ed1c24!important;
+}
+.minified nav>ul>li,
+.minified nav>ul>li a {
+    position: relative;
+}
+.minified nav ul>li>a {
+    padding: 10px 11px;
+    display: block;
+}
+.minified nav>ul>li>a .fa.fa-fw {
+    display: block;
+    width: auto;
+    text-align: center;
+    padding: 0;
+}
+.minified nav>ul>li>a>i {
+    text-align: center;
+    margin: 0;
+    display: block;
+}
+.minified nav>ul>li.active>a::before {
+    content: "\f0d9"
+}
+.minified nav ul ul li a {
+    padding-left: 14px;
+}
+.minified nav ul ul li li a {
+    padding-left: 25px;
+}
+.minified nav>ul ul li::before,
+.minified nav>ul>li>ul::before {
+    left: 12px;
+}
+.minified nav>ul>li>a .menu-item-parent,
+.minified nav>ul>li>a>b {
+    display: none;
+}
+.minified nav>ul>li>a>.menu-item-parent {
+    display: none;
+    position: absolute;
+    left: 40px;
+    top: -3px;
+    width: 86px;
+    height: 38px;
+    line-height: 38px;
+    background-color: #f5f5f5;
+    color: #333;
+    z-index: 3;
+    -webkit-box-shadow: 2px 1px 2px 0 rgba(0, 0, 0, .2);
+    box-shadow: 2px 1px 2px 0 rgba(0, 0, 0, .2);
+    border-left: 1px solid #bfbfbf;
+    border-top: 1px solid #D8D4D4;
+    border-bottom: 1px solid #fff;
+    padding-left: 12px;
+}
+.minified nav>ul>li>ul {
+    display: none!important;
+    position: absolute;
+    left: 40px;
+    width: 100px;
+    z-index: 5;
+    border: 1px solid #bfbfbf;
+    min-height: 180px;
+    -webkit-box-shadow: 1px 1px 2px 0 rgba(0, 0, 0, .2);
+    box-shadow: 1px 1px 2px 0 rgba(0, 0, 0, .2);
+    background: #3A3633;
+    margin-top: -3px;
+}
+.minified nav ul>li>ul>li>ul {
+    position: relative;
+    left: 13px;
+    border: 0;
+    margin-left: -12px;
+    width: 197px;
+}
+.minified nav>ul>li:hover>a>.menu-item-parent,
+.minified nav>ul>li:hover>ul {
+    display: block!important;
+}
+.minified nav>ul>li>ul>li {
+    background-color: rgba(69, 69, 69, .9);
+}
+.minified nav>ul>li>ul>li>ul>li {
+    background-color: #484B50;
+}
+.minified nav>ul>li {
+    border-bottom: 1px solid #1A1817;
+    border-top: 1px solid #525151;
+}
+.minified nav>ul>li>ul::before {
+    border-left: 0;
+}
+.minified nav>ul ul li::before {
+    border: 0;
+}
+.slimScrollDiv,
+.slimScrollDiv>:first-child {
+    overflow: hidden;
+}
+.minified .slimScrollDiv,
+.minified .slimScrollDiv>:first-child {
+    overflow: visible!important;
+}
+.minified .slimScrollBar,
+.minified .slimScrollRail {
+    display: none;
+}
+.minified nav>ul>li>ul>li>a,
+.minified nav>ul>li>ul>li>ul>li>a {
+    padding-top: 7px;
+    padding-bottom: 7px;
+}
+.minified nav>ul>li>ul>li>ul>li a {
+    padding-top: 6px;
+    padding-bottom: 6px;
+}
+.minified nav ul ul ul ul li a {
+    padding-left: 45px;
+}
+.minified nav ul ul ul ul ul li a {
+    padding-left: 62px;
+}
+.minified nav ul ul ul ul ul ul li a {
+    padding-left: 82px;
+}
+.hidden-menu .minifyme,
+.minified #hide-menu {
+    display: none;
+}
+.btn-header>:first-child>a {
+    border-radius: 2px;
+    cursor: default!important;
+    display: inline-block;
+    font-weight: 700;
+    height: 30px;
+    min-width: 30px;
+    padding: 2px;
+    text-align: center;
+    text-decoration: none!important;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    background-color: #f8f8f8;
+    background-image: -webkit-gradient(linear, left top, left bottom, from(#f8f8f8), to(#f1f1f1));
+    background-image: -webkit-linear-gradient(top, #f8f8f8, #f1f1f1);
+    background-image: -webkit-gradient(linear, top left, bottom left, from(#f8f8f8), to(#f1f1f1));
+    background-image: -webkit-linear-gradient(top, #f8f8f8, #f1f1f1);
+    background-image: linear-gradient(top, #f8f8f8, #f1f1f1);
+    border: 1px solid #bfbfbf;
+    color: #6D6A69;
+    font-size: 17px;
+    margin: -3px 0 0;
+}
+.MessageBoxContainer {
+    top: 35%;
+    color: #fff;
+    position: relative;
+    width: 100%;
+    background-color: #232323;
+    background-color: rgba(0, 0, 0, .8);
+    padding: 20px;
+}
+.MessageBoxMiddle {
+    position: relative;
+    left: 20%;
+    width: 60%
+}
+.MessageBoxMiddle .MsgTitle {
+    letter-spacing: -1px;
+    font-size: 24px;
+    font-weight: 300;
+}
+.MessageBoxMiddle .pText {
+    font-style: 30px;
+}
+.MessageBoxContainer input,
+.MessageBoxContainer select {
+    width: 50%;
+    padding: 5px;
+}
+.MessageBoxButtonSection {
+    width: 100%;
+    height: 30px;
+}
+.MessageBoxButtonSection button {
+    float: right;
+    margin-right: 7px;
+    padding-left: 15px;
+    padding-right: 15px;
+    font-size: 14px;
+    font-weight: 700;
+}
+.divMessageBox {
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    background: rgba(0, 0, 0, .6);
+    z-index: 100000;
+}
+.animated {
+    -webkit-animation-duration: 1s;
+    animation-duration: 1s;
+    -webkit-animation-fill-mode: both;
+    animation-fill-mode: both;
+}
+.animated.fast {
+    -webkit-animation-duration: .4s;
+    -ms-animation-duration: .4s;
+    animation-duration: .4s;
+}
+@-webkit-keyframes fadeIn {
+    0% {
+        opacity: 0;
+    }
+    100% {
+        opacity: 1;
+    }
+}
+@keyframes fadeIn {
+    0% {
+        opacity: 0;
+    }
+    100% {
+        opacity: 1;
+    }
+}
+.fadeIn {
+    -webkit-animation-name: fadeIn;
+    animation-name: fadeIn;
+}
+@-webkit-keyframes fadeInRight {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(20px);
+    }
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+    }
+}
+@keyframes fadeInRight {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(20px);
+        -ms-transform: translateX(20px);
+        transform: translateX(20px);
+    }
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+.fadeInRight {
+    -webkit-animation-name: fadeInRight;
+    animation-name: fadeInRight;
+}
+@-webkit-keyframes fadeInUp {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(20px);
+    }
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+    }
+}
+@keyframes fadeInUp {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(20px);
+        -ms-transform: translateY(20px);
+        transform: translateY(20px);
+    }
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+.fadeInUp {
+    -webkit-animation-name: fadeInUp;
+    animation-name: fadeInUp;
+}
+@-webkit-keyframes fadeOut {
+    0% {
+        opacity: 1;
+    }
+    100% {
+        opacity: 0;
+    }
+}
+@keyframes fadeOut {
+    0% {
+        opacity: 1;
+    }
+    100% {
+        opacity: 0;
+    }
+}
+.fadeOut {
+    -webkit-animation-name: fadeOut;
+    animation-name: fadeOut;
+}
+@-webkit-keyframes fadeOutLeft {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+    }
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-20px);
+    }
+}
+@keyframes fadeOutLeft {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-20px);
+        -ms-transform: translateX(-20px);
+        transform: translateX(-20px);
+    }
+}
+.fadeOutLeft {
+    -webkit-animation-name: fadeOutLeft;
+    animation-name: fadeOutLeft;
+}
+#shortcut {
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: auto;
+    width: 100%;
+    background-color: #33302F;
+    background-color: rgba(0, 0, 0, .85);
+    z-index: 1009;
+    display: none;
+    color: #fff;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+#shortcut ul {
+    padding: 11px 12px 7px;
+    list-style: none;
+    margin: 0;
+    border-bottom: 1px solid #423F3F;
+}
+#shortcut ul li {
+    width: auto;
+}
+#shortcut ul li .jarvismetro-tile {
+    margin: 0 3px 3px;
+    border: 0;
+    border-radius: 0;
+}
+#shortcut ul li .jarvismetro-tile:hover {
+    color: #fff;
+    text-decoration: none;
+}
+#shortcut ul li .jarvismetro-tile:active,
+#shortcut ul li .jarvismetro-tile:focus {
+    left: 0;
+    top: 0;
+}
+.shortcut-on #response-btn {
+    display: none!important;
+}
+.shortcut-on #left-bar .navbar,
+.shortcut-on #main .navbar {
+    border: 0!important;
+}
+@media (min-width: 768px) and (max-width: 980px) {
+    .left-projects-links {
+        font-size: 12px!important;
+    }
+    #logout {
+        margin-top: -10px;
+    }
+}
+/*Dev.html CSS-Main*/
+
+@media (min-width: 992px) {
+    .modal-lg {
+        width: 900px;
+    }
+}
+.padding-right0 {
+    padding-right: 0px !important;
+}
+.line-height-2 {
+    line-height: 2;
+}
+.searchoptionforCookbooks {
+    width: 96%;
+}
+.searchoptionforRoles {
+    width: 96%;
+}
+.chefItemwithoutOrgloadingContainerCSS {
+    height: 50px;
+    width: 50px;
+    margin-top: 10%;
+    margin-bottom: 10%;
+}
+.font-size-12 {
+    font-size: 12px!important;
+    font-weight: 350;
+}
+.width-170 {
+    width: 170px;
+}
+.text-align-center {
+    text-align: center;
+}
+.padding0 {
+    padding: 0px !important;
+}
+.deploymentsListCSS {
+    border: 1px solid #dddddd;
+    list-style: none outside none;
+    height: 150px;
+    overflow-y: auto;
+}
+.text-align-center {
+    text-align: center;
+}
+.margin-5 {
+    margin: 5px;
+}
+.margin-top-172 {
+    margin-top: 172px;
+}
+.padding-bottom-10 {
+    padding-bottom: 10px;
+}
+.btnItemCSS {
+    width: 30px;
+    height: 27px;
+}
+.font-size-20 {
+    font-size: 20px;
+}
+.deploymentSelectedRunListCSS {
+    border: 1px solid #dddddd;
+    list-style: none outside none;
+    height: 410px;
+    overflow-y: auto;
+}
+.margin-left-10 {
+    margin-left: 10px;
+}
+.noleftpadding {
+    padding-left: 0px;
+}
+.trackerAnchortag {
+    color: white;
+    font-weight: bold;
+}
+.paddingEnvTree {
+    margin-right: 5px !important;
+}
+.DockerImage {
+    margin-top: -10px;
+    margin-left: 20px;
+}
+.collapseActive {
+    background-color: #2c3742 !important;
+}
+.panel-databag {
+    line-height: 2.1;
+    color: #333;
+}
+.panel-databag1 {
+    line-height: 2.1;
+    color: #333;
+}
+.panel-databag:hover {
+    color: #85E0FF;
+}
+.panel-databag1:hover {
+    color: #85E0FF;
+}
+#serviceBox {
+    width: 100%;
+    margin: 0 auto;
+    margin-top: 75px;
+    height: 250px;
+    border: 1px solid black;
+}
+#serviceBox1 {
+    width: 100%;
+    margin: 0 auto;
+    margin-top: 75px;
+    height: 115px;
+    border: 1px solid black;
+}
+.serviceBox1,
+.serviceBox2,
+.serviceBox3 {
+    float: left;
+}
+.instance-bootstrap-list-image {
+    border-radius: 0px !important;
+    box-shadow: none !important;
+}
+.instance-bootstrap-list-faimage {
+    border-radius: 0px !important;
+    box-shadow: none !important;
+}
+.role-Selectedcard {
+    border: 2px solid #40baf1 !important;
+    border-radius: 12px !important;
+    box-shadow: 0 4px 10px rgba(0, 0, 0, .3);
+}
+.card-backflip {
+    background-repeat: no-repeat;
+    background-color: white !important;
+    border: 1px solid #dddddd;
+    border-radius: 11px;
+    padding-top: 4px;
+    background-size: 100% 204px;
+}
+.card-backflip-margin {
+    margin-top: 15px;
+}
+.jarviswidget {
+    margin: 0px !important;
+}
+.container {
+    -webkit-perspective: 1000;
+    -moz-perspective: 1000;
+    -ms-perspective: 1000;
+    perspective: 1000;
+    padding-left: 0px !important;
+    padding-right: 0px !important;
+}
+.domain-role-thumbnailDev > .container {
+    -webkit-perspective: none !important;
+}
+.flip-toggle.flip .card {
+    -webkit-transform: rotateY(180deg);
+    -moz-transform: rotateY(180deg);
+    -ms-transform: rotateY(180deg);
+    transform: rotateY(180deg);
+    filter: FlipH;
+    -ms-filter: "FlipH";
+}
+.front,
+.back {
+    width: 160px;
+    height: 209px;
+}
+.container {
+    width: 164px;
+    height: 215px;
+}
+.card {
+    -webkit-transition: 0.6s;
+    -webkit-transform-style: preserve-3d;
+    -moz-transition: 0.6s;
+    -moz-transform-style: preserve-3d;
+    -ms-transition: 0.6s;
+    transition: 0.6s;
+    transform-style: preserve-3d;
+    position: relative;
+    width: 100%;
+    height: 100%;
+}
+.front,
+.back {
+    -webkit-backface-visibility: hidden;
+    -moz-backface-visibility: hidden;
+    -ms-backface-visibility: hidden;
+    backface-visibility: hidden;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+.back {
+    -webkit-transform: rotateY(180deg);
+    -moz-transform: rotateY(180deg);
+    -ms-transform: rotateY(180deg);
+    transform: rotateY(180deg);
+}
+.cardBackRunlistContaner {
+    height: 142px;
+    margin-top: 3px;
+    overflow-x: hidden;
+    overflow-y: auto;
+    width: 155px;
+}
+hr {
+    margin: 2px !important;
+}
+.demo1 {
+    background: none repeat scroll 0 0 #2c3742;
+    border-radius: 0 5px 5px 0;
+    height: 30px;
+    left: 0;
+    padding: 0 10px 10px;
+    position: absolute;
+    top: 7px;
+    width: 35px;
+    z-index: 5;
+}
+.demo1 > span {
+    position: absolute;
+    top: 0px;
+    display: block;
+    height: 20px;
+    width: 30px;
+    border-radius: 5px 0 0 5px;
+    background: #F1DA91;
+    padding: 2px;
+    text-align: center;
+    line-height: 28px;
+    cursor: pointer;
+}
+.demo1 > span i {
+    font-size: 17px;
+}
+.demo1.activate > span i:before {
+    content: "\f00d";
+}
+.demo1 #hide-menu > span:hover i {
+    color: #fff !important;
+}
+.light-blue {
+    background-color: #40baf1;
+}
+.light-black {
+    background-color: #2c3638;
+}
+.productdiv4 {
+    width: 156px;
+    float: left;
+    padding-top: 7px;
+    margin-left: 10px;
+}
+.BGtextoverflow {
+    font-weight: bold;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 152px;
+}
+.Projtextoverflow {
+    font-weight: bold;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 142px;
+    padding-left: 5px !important;
+}
+.Envtextoverflow {
+    font-weight: bold;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+.cardHeadingTextoverflow {
+    display: inline-block;
+    font-weight: bold;
+    margin-top: 4px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    width: 72px;
+}
+.Cardtextoverflow {
+    font-size: 12px;
+    overflow: hidden;
+    padding-left: 0px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+.productdiv2 {
+    background-color: #ffffff;
+    border: 1px solid #dddddd;
+    border-radius: 4px;
+    display: block;
+    height: 152px;
+    line-height: 1.42857;
+    margin-bottom: 15px;
+    margin-top: 15px;
+    padding: 4px;
+    width: 152px;
+    transition: all 0.2s ease-in-out 0s;
+    cursor: pointer;
+}
+.btn1 {
+    display: inline-block;
+    margin-bottom: 0;
+    font-weight: normal;
+    text-align: center;
+    vertical-align: middle;
+    cursor: pointer;
+    background-image: none;
+    border: 1px solid transparent;
+    white-space: nowrap;
+    padding: 2px 6px;
+    font-size: 13px;
+    line-height: 1.428571429;
+    border-radius: 2px;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    -o-user-select: none;
+    user-select: none
+}
+.btn1:focus {
+    outline: thin dotted;
+    outline: 5px auto -webkit-focus-ring-color;
+    outline-offset: -2px
+}
+.btn1:hover,
+.btn1:focus {
+    color: #333;
+    text-decoration: none
+}
+.btn1:active,
+.btn1.active {
+    outline: 0;
+    background-image: none;
+    -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+    box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125)
+}
+.orgSelected {
+    background-color: #2C3742;
+}
+/*Arabinda added for Tag input*/
+
+.bootstrap-tagsinput > span {
+    background: none repeat scroll 0 0 #2c3742;
+    border: 1px solid #2c3742;
+    border-radius: 0 !important;
+    font-size: 13px;
+    font-weight: 400;
+    padding: 3px 28px 4px 8px;
+}
+.bootstrap-tagsinput .tag [data-role="remove"] {
+    cursor: pointer;
+    display: block;
+    height: 15px;
+    padding: 3px 4px 3px 5px;
+    position: absolute;
+    right: 0;
+    top: -1px;
+    width: 15px;
+}
+.bootstrap-tagsinput {
+    background-color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 0;
+    color: #555;
+    display: block;
+    font-size: 13px;
+    line-height: 1.42857;
+    min-height: 28px;
+    padding: 1px 3px;
+    vertical-align: middle;
+    width: 100%;
+}
+.widget-header {
+    background: linear-gradient(to bottom, #fff 0px, #eee 100%) repeat-x scroll 0 0 #f7f7f7;
+    border-bottom: 1px solid #ddd;
+    box-sizing: content-box;
+    color: #669fc7;
+    min-height: 38px;
+    padding-left: 12px;
+    position: relative;
+}
+.widget-box {
+    border: 1px solid #ccc;
+    box-shadow: none;
+    margin: 3px 0;
+    padding: 0;
+}
+.widget-header:after {
+    clear: right;
+}
+.widget-main {
+    padding: 12px;
+}
+.widget-toolbox:last-child {
+    border-top: 1px solid #ccc;
+    padding: 6px;
+}
+.widget-toolbox {
+    background-color: #eee;
+}
+.widget-header > .widget-title {
+    display: inline;
+    line-height: 36px;
+    margin: 0;
+    padding: 0;
+}
+.widget-toolbar {
+    display: inline-block;
+    float: right;
+    line-height: 37px;
+    padding: 0 10px;
+    position: relative;
+}
+/*Above are from ace.css*/
+
+.blueprintdiv {
+    background-color: #ffffff;
+    border: 1px solid #dddddd;
+    border-style: solid;
+    border-width: 1px;
+    height: 172px;
+    margin: 15px 15px 15px;
+    padding: 0 !important;
+    position: relative;
+    width: 64%;
+    cursor: pointer;
+}
+/*Added for padding top in the li*/
+
+.Padded {
+    padding-top: 4px;
+}
+.carousel-control {
+    width: 0% !important;
+}
+.smart-style-1 nav ul ul li > span:hover {
+    background: #1b1e24 !important;
+}
+.smart-style-1 nav ul li span:hover {
+    color: #E1EAF1 !important;
+}
+.smart-style-1 nav ul ul ul li span {
+    padding: 8px 17px 8px 54px !important;
+}
+.smart-style-1 nav ul ul li > span {} .smart-style-1 nav ul ul li > span {
+  color: #E1EAF1;
+  display: block;
+  font-size: 13px;
+  font-weight: 300;
+  padding-bottom: 6px !important;
+  padding-left: 43px;
+  padding-top: 6px !important;
+  text-shadow: 0 1px 1px #000000;
+}
+.domain-roles-heading {
+    font-size: 12px;
+    height: 25px;
+    overflow: hidden;
+    width: 152px;
+}
+.row1 {
+    padding: 0px;
+}
+.form-control1 {
+    height: auto !important;
+    padding: 0px !important;
+}
+.productdiv {
+    position: relative;
+    padding: 0px !important;
+    margin: 15px;
+    background-color: #ffffff;
+    border-color: #e5e5e5 #eee #eee;
+    border-style: solid;
+    border-width: 1px;
+    height: 118px;
+    width: 140px;
+}
+.margin-top5{
+    margin-top: 20px;
+}
+/*border added for productdiv1 in Dev Angular to sync with Blueprint Card Design*/
+.productdiv1 {
+    position: relative;
+    border-width: 1px;
+    border:1px solid #ccc;
+    border-radius: 4px;
+}
+.glowBox {
+    background: none repeat scroll 0 0 #FFFFFF;
+    border-radius: 4px;
+    box-shadow: 0 0 15px 1px rgba(0, 0, 0, 0.4);
+}
+.badge-warning {
+    background: none repeat scroll 0 0 #FF6A00 !important;
+}
+.system-prop-text {
+    font-size: 9px;
+}
+.center-alignment {
+    display: inline-block;
+    text-align: center;
+}
+.badge-info {
+    background: none repeat scroll 0 0 #5BC0DE !important;
+}
+.role-container {
+    cursor: pointer;
+}
+.system-prop {
+    position: relative;
+}
+.role-Selected {
+    border: 2px solid #40baf1;
+    border-radius: 4px;
+}
+.role-Selected1 {
+    border: 2px solid #40baf1;
+    border-radius: 4px;
+}
+html,
+button,
+input,
+select,
+textarea {
+    font-family: sans-serif;
+    color: #222;
+}
+.hidePanel {
+    display: none;
+}
+body {
+    margin: 0;
+    line-height: 1.4;
+}
+.text-faded {
+    color: rgba(255, 255, 255, 0.7);
+}
+/*Domain role*/
+/*Instances page Important*/
+
+.domain-role-thumbnail {
+    border-radius: 5px;
+    float: left;
+    margin-bottom: 20px;
+    margin-right: 18px;
+    min-width: 162px;
+}
+.domain-role-thumbnailDev {
+    border-radius: 5px;
+    float: left;
+    margin-bottom: 20px;
+    margin-right: 59px;
+    min-width: 162px;
+}
+.domain-roles {
+    border: 1px solid #DDDDDD;
+    border-radius: 11px;
+    display: block;
+    line-height: 1.42857;
+    margin-bottom: 20px;
+    max-width: 170px;
+    min-height: 204px;
+    padding-bottom: 4px;
+    padding-left: 4px;
+    padding-right: 4px;
+    padding-top: 3px;
+    text-align: left;
+    transition: all 0.2s ease-in-out 0s;
+}
+.instance-details-list {
+    font-size: 10px;
+    padding-bottom: 0px;
+    padding-top: 5px;
+    text-align: center;
+}
+.instance-details-item {
+    display: block;
+    margin-left: 20px;
+}
+.instance-details-itemCP {
+    display: block;
+}
+.instance-details-id {
+    display: block;
+}
+.instance-bootstrap-ActionChefRun {
+    float: left;
+}
+.instance-bootstrap-ActionStart {
+    float: left;
+}
+.instance-bootstrap-ActionRestart {
+    float: left;
+}
+.instance-bootstrap-ActionSSH {
+    float: left !important;
+    margin-top: 0px !important;
+}
+.instance-bootstrap-ActionRDP {
+    float: left !important;
+    margin-top: 0px !important;
+}
+.instance-bootstrap-ActionShutdown {
+    float: left;
+}
+.instance-bootstrap-list {
+    font-size: 10px;
+    padding-top: 20px;
+    text-align: center;
+}
+.instance-bootstrap-listControlpanel {
+    font-size: 10px;
+    padding-right: 40px;
+    padding-top: 14px;
+    text-align: center;
+}
+.instance-state {} .instance-state-text-started {
+                       color: #008000;
+                   }
+.instance-state-text-stopped {
+    color: red;
+}
+.instance-state-text-pending {
+    color: grey;
+}
+.instance-state-text-paused {
+    color: orange;
+}
+.content-container {
+    display: block;
+    height: 99%;
+}
+.main-content {
+    float: left;
+    height: 100%;
+    max-height: 89%;
+    overflow-x: hidden;
+    overflow-y: auto;
+    width: 85%;
+}
+.nobody {
+    padding: 0px !important;
+}
+/*For ContentProject Page*/
+
+.panel-widgets {
+    float: right;
+    margin: 10px 10px;
+}
+/*For Mobile*/
+
+@media (max-width: 767px) {
+    .side {
+        float: left;
+        width: 0;
+        margin-top: 0;
+        margin-left: 0;
+        left: 0;
+        background-color: none;
+        height: 0;
+        overflow-y: auto;
+        z-index: 1000;
+        transition: all 0.4s ease 0s;
+        font-size: 14px;
+    }
+}
+*::-moz-selection {
+    background: none repeat scroll 0 0 grey;
+    color: #fff;
+    text-shadow: none;
+}
+/* For image replacement */
+
+.ir {
+    display: block;
+    border: 0;
+    text-indent: -999em;
+    overflow: hidden;
+    background-color: transparent;
+    background-repeat: no-repeat;
+    text-align: left;
+    direction: ltr;
+    *line-height: 0;
+}
+.ir br {
+    display: none;
+}
+/* Hide from both screenreaders and browsers: h5bp.com/u */
+
+.hidden {
+    display: none !important;
+    visibility: hidden;
+}
+/* Hide visually and from screenreaders, but maintain layout */
+
+.invisible {
+    visibility: hidden;
+}
+/* Contain floats: h5bp.com/q */
+
+.clearfix:before,
+.clearfix:after {
+    content: "";
+    display: table;
+}
+.clearfix:after {
+    clear: both;
+}
+.clearfix {
+    *zoom: 1;
+}
+@media print {
+    * {
+        background: transparent !important;
+        color: black !important;
+        box-shadow: none !important;
+        text-shadow: none !important;
+        filter: none !important;
+        -ms-filter: none !important;
+    }
+    /* Black prints faster: h5bp.com/s */
+
+    a,
+    a:visited {
+        text-decoration: underline;
+    }
+    a[href]:after {
+        content: " (" attr(href) ")";
+    }
+    abbr[title]:after {
+        content: " (" attr(title) ")";
+    }
+    .ir a:after,
+    a[href^="javascript:"]:after,
+    a[href^="#"]:after {
+        content: "";
+    }
+    /* Don't show links for images, or javascript/internal links */
+
+    pre,
+    blockquote {
+        border: 1px solid #999;
+        page-break-inside: avoid;
+    }
+    thead {
+        display: table-header-group;
+    }
+    /* h5bp.com/t */
+
+    tr,
+    img {
+        page-break-inside: avoid;
+    }
+    img {
+        max-width: 100% !important;
+    }
+    @page {
+        margin: 0.5cm;
+    }
+    p,
+    h2,
+    h3 {
+        orphans: 3;
+        widows: 3;
+    }
+    h2,
+    h3 {
+        page-break-after: avoid;
+    }
+}
+/* Add this attribute to the element that needs a tooltip */
+
+[data-tooltip] {
+    position: relative;
+    z-index: 2;
+    cursor: pointer;
+}
+/* Hide the tooltip content by default */
+
+[data-tooltip]:before,
+[data-tooltip]:after {
+    visibility: hidden;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+    filter: progid: DXImageTransform.Microsoft.Alpha(Opacity=0);
+    opacity: 0;
+    pointer-events: none;
+}
+/* Position tooltip above the element */
+
+[data-tooltip]:before {
+    position: absolute;
+    bottom: 150%;
+    left: 50%;
+    margin-bottom: 5px;
+    margin-left: -80px;
+    padding: 7px;
+    width: 160px;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    background-color: #000;
+    background-color: hsla(0, 0%, 20%, 0.9);
+    color: #fff;
+    content: attr(data-tooltip);
+    text-align: center;
+    font-size: 14px;
+    line-height: 1.2;
+}
+/* Triangle hack to make tooltip look like a speech bubble */
+
+[data-tooltip]:after {
+    position: absolute;
+    bottom: 150%;
+    left: 50%;
+    margin-left: -5px;
+    width: 0;
+    border-top: 5px solid #000;
+    border-top: 5px solid hsla(0, 0%, 20%, 0.9);
+    border-right: 5px solid transparent;
+    border-left: 5px solid transparent;
+    content: " ";
+    font-size: 0;
+    line-height: 0;
+}
+/* Show tooltip content on hover */
+
+[data-tooltip]:hover:before,
+[data-tooltip]:hover:after {
+    visibility: visible;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+    filter: progid: DXImageTransform.Microsoft.Alpha(Opacity=100);
+    opacity: 1;
+}
+/*Background Image removed for cardImage in Dev Angular to sync with Blueprint Card Design*/
+.cardimage {
+    background-repeat: no-repeat;
+    height: 163px;
+    margin-left: 15px;
+}
+/*To fix table overlap*/
+
+.widget-main {
+    overflow: hidden;
+}
+/*Margin left changed for cardLogo in Dev Angular to sync with Blueprint Card Design*/
+.cardLogo {
+    height: 52px;
+    padding-top: 11px;
+    margin-top: 20px;
+    margin-left: 8px;
+}
+.moreInfo {
+    background-repeat: no-repeat;
+    float: left;
+    height: 27px;
+    width: 30px;
+    margin-top: 0px;
+}
+.moreinfoBuild {
+    background-repeat: no-repeat;
+    float: left;
+    height: 27px;
+    width: 30px;
+    margin-top: 0px;
+}
+.moreinfoAppDeploy {
+    background-repeat: no-repeat;
+    float: left;
+    height: 27px;
+    width: 30px;
+    margin-top: 0px;
+}
+.moreinfoactionHistory {
+    background-repeat: no-repeat;
+    float: left;
+    height: 27px;
+    width: 30px;
+    margin-top: 0px;
+}
+.descriptionMoreInfo {
+    height: 30%;
+    width: 30%;
+    background-image: url('../img/galleryIcons/moreinfo.png');
+    background-repeat: no-repeat;
+    float: left;
+    height: 27px;
+    width: 30px;
+    margin-top: 0px;
+}
+.componentlistContainer {
+    height: 30%;
+    background-image: url('../img/aws_logo.png');
+    background-repeat: no-repeat;
+    height: 101px;
+    margin-left: 25px;
+}
+.componentlistContainer.started {
+    background-image: url('../img/aws_logo_started.png');
+}
+.componentlistContainer.stopped {
+    background-image: url('../img/aws_logo_stopped.png');
+}
+.componentlistContainer.paused {
+    background-image: url('../img/aws_logo_paused.png');
+}
+.componentlistContainer.pending {
+    background-image: url('../img/rsz_inactive.png');
+}
+.instancestatusindicator {
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: 30px 30px;
+}
+.instancestatusindicator.started {
+    background-image: url('../img/aws_logo_started.png');
+}
+.instancestatusindicator.stopped {
+    background-image: url('../img/aws_logo_stopped.png');
+}
+.instancestatusindicator.paused {
+    background-image: url('../img/aws_logo_paused.png');
+}
+.instancestatusindicator.pending {
+    background-image: url('../img/rsz_inactive.png');
+}
+.rowcustomselected {
+    background-color: lightblue !important;
+    color: black !important;
+    font-weight: bold;
+}
+.actionbuttonStart {
+    background-repeat: no-repeat;
+    float: left;
+    height: 27px;
+    width: 100%;
+    margin-top: 0px;
+}
+.sshIcon {
+    background-repeat: no-repeat;
+    float: left;
+}
+.rdpIcon {
+    background-image: url('../img/galleryIcons/rdp.png');
+    background-repeat: no-repeat;
+    float: left;
+    height: 30px;
+    margin-left: 2px;
+    width: 100%;
+    margin-top: 2px;
+}
+.actionbuttonChefClientRun {
+    background-repeat: no-repeat;
+    float: left;
+    height: 27px;
+    margin-left: 4px;
+    width: 32%;
+}
+#customRow .actionbuttonChefClientRun {
+    position: relative;
+    left: 32%;
+}
+.actionbuttonShutdown {
+    background-repeat: no-repeat;
+    float: left;
+    height: 27px;
+    width: 100%;
+}
+.actionbuttonCPStart {
+    height: 27px;
+    width: 30px;
+    background-repeat: no-repeat;
+    float: left;
+    margin-top: 0px;
+}
+.actionbuttonCPRestart {
+    height: 27px;
+    width: 30px;
+    background-image: url('../img/galleryIcons/restart.png');
+    background-repeat: no-repeat;
+    float: left;
+    margin-left: 4px;
+}
+.actionbuttonCPShutdown {
+    height: 27px;
+    width: 30px;
+    background-image: url('../img/galleryIcons/shut_down.png');
+    background-repeat: no-repeat;
+    float: left;
+    margin-left: 4px;
+}
+.actiondockercontainer {
+    height: 27px;
+    width: 30px;
+    background-image: url('../img/galleryIcons/Docker.png');
+    background-repeat: no-repeat;
+    float: left;
+    margin-left: 4px;
+}
+.panel-title {
+    display: inline-block;
+}
+.swap-view {
+    margin: 2px;
+}
+.chefCookbookList {} .disabled {
+                         display: none;
+                     }
+.blueprintContainer {
+    display: ;
+}
+.deploymentCookbookSelected {
+    border: 1px solid #40baf1;
+}
+.designCookbookSelect {
+    width: 200px;
+    float: left;
+}
+.logsArea {
+    height: 413px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    word-break: break-all;
+}
+.logsForAppDeploy {
+    height: 413px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    word-break: break-all;
+    font-size: 12px;
+}
+.logsAreaBootstrap {
+    height: 400px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    background-color: black;
+    padding-top: 5px;
+    margin-top: 5px;
+}
+.tableactionbutton {
+    border-radius: 50% !important;
+}
+.tableactionbuttonpadding {
+    margin-left: 10px !important;
+}
+.tableactionWidth {
+    width: 110px;
+}
+.rowCustomStyle {
+    height: 34px;
+    font-weight: bold;
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#fafafa));
+}
+.tableactionWidthCheficon {
+    width: 241px;
+}
+.tableactionWidthChef {
+    width: 152px;
+}
+.cookbookChefClientRun {
+    height: 150px;
+    overflow-x: auto;
+    overflow-y: auto;
+    width: 150px;
+    border: 1px solid #ccc;
+}
+.marginleft-40 {
+    margin-left: 40px;
+}
+.padding-top-30 {
+    padding-top: 30px !important;
+}
+.width-100 {
+    width: 100%;
+}
+.fa-1.7x {
+           font-size: 1.7em;
+       }
+#logo img {
+    width: 100px !important;
+}
+/*Added for small button flip in docker container */
+
+.container1 {
+    width: 30px;
+    height: 30px;
+    position: relative;
+    -ms-perspective: 1000;
+    perspective: 1000;
+}
+.card1 {
+    display: block;
+    height: 100%;
+    width: 100%;
+    border-radius: 15px;
+    color: white;
+    text-align: center;
+    font-weight: bold;
+    font-size: 14px;
+    position: absolute;
+    transition: all 0.5s linear;
+    backface-visibility: hidden;
+}
+.card1.flipped1 {
+    -ms-transform: rotateY(360deg);
+    transform: rotateY(360deg);
+}
+.front1 {
+    background: green;
+}
+.frontTerminate {
+    background: #B80000;
+}
+.actionbuttonStartContainer {
+    background-repeat: no-repeat;
+    float: left;
+    height: 27px;
+    width: 100%;
+    margin-top: 1px;
+}
+.actionbuttonRestartContainer {
+    height: 30%;
+    width: 30%;
+    background-image: url('../img/galleryIcons/restart.png');
+    background-repeat: no-repeat;
+    float: left;
+    height: 27px;
+    margin-left: 4px;
+    width: 32%;
+}
+.actionbuttonShutdownContainer {
+    background-repeat: no-repeat;
+    float: left;
+    height: 27px;
+    width: 100%;
+    margin-top: 1px;
+}
+.actionbutton {
+    width: 27px;
+    margin-left: 11px;
+    margin-top: 2px;
+}
+.turn90deg {
+    -webkit-transform: rotate(90deg);
+    -moz-transform: rotate(90deg);
+    -ms-transform: rotate(90deg);
+    -o-transform: rotate(90deg);
+    transform: rotate(90deg);
+}
+.lasttdactionbtn {
+    margin-left: 10px !important;
+}
+.cardGreenRedYellowBlack {
+    display: inline-block;
+    height: 30px;
+    width: 30px;
+    border-radius: 15px;
+    color: white;
+    text-align: center;
+    font-weight: bold;
+    font-size: 14px;
+    transition: all 0.5s linear;
+    backface-visibility: hidden;
+    padding-top: 5px;
+}
+.frontGreen {
+    background: green;
+}
+.frontRed {
+    background: #B80000;
+}
+.frontRestart {
+    background: #FFCC00;
+}
+.frontKill {
+    background: #363636;
+}
+.frontStatus {
+    background: #3366CC;
+}
+/*Style CSS for header,navigation*/
+
+header {
+    min-height: 8%!important;
+}
+@media(min-width:1400px) {
+    header {
+        min-height: 4.5%!important;
+    }
+    #left-panel {
+        height: 94.3%!important;
+    }
+}
+.menu-item-parentdemo li b {
+    float: right;
+}
+nav ul {
+    padding: 0;
+    margin: 0;
+    font-size: 13px;
+    line-height: 0.5em;
+    list-style: none;
+    position: relative;
+}
+.breadcrumb1 {
+    border-radius: 4px;
+    list-style: none outside none;
+    margin-bottom: 20px;
+    padding: 8px 15px;
+    margin-bottom: 0px!important;
+    background-color: #3a3633!important;
+}
+.breadcrumb1 > .active {
+    color: #a8a8a8!important;
+}
+.breadcrumb1 > li + li:before {
+    color: #ccc;
+    content: " ";
+    padding: 0 5px;
+}
+.breadcrumb1 > li {
+    display: inline-block;
+}
+.text-faded {
+    color: rgba(255, 255, 255, 0.7);
+}
+/*footer*/
+
+.footer {
+    background: none repeat scroll 0 0 white;
+    bottom: 0;
+    left: 0;
+    position: fixed;
+    right: 0;
+}
+.navbar {
+    border: none!important;
+    border-radius: 0px!important;
+    margin-bottom: 0px!important;
+}
+.navbar-default {
+    background-color: #2C3742!important;
+}
+@media (min-width: 768px) {
+    .navbar-brand {
+        padding: 8px!important;
+        width: 19%;
+    }
+    .iconLogo {
+        height: 40px;
+    }
+    .navbar-nav {
+        margin-top: 20px;
+        width: 80%;
+    }
+    .navbar-nav .navRight {
+        float: right;
+    }
+    .left-projects-links {
+        display: inline!important;
+    }
+    .left-projects-links>a {
+        display: inline!important;
+        font-size: 14px!important;
+        color: #fff!important;
+    }
+    #settingsNewClick{
+        color:#3276b1!important;
+    }
+    #designStyle {
+        margin-left: 16px;
+    }
+    #trackStyle {
+        margin-left: 16px;
+        margin-right: 16px;
+    }
+    #liuserinfo {
+        color: white;
+        margin-right: 16px;
+        font-size: 14px;
+    }
+    .panelStyle {
+        width: 86%;
+    }
+    .jobStyle {
+        margin-top: 5px;
+    }
+    /*#chefRunlistModal .modal-content {
+        width: 800px;
+    }*/
+    .cpCardStyle {
+        padding-top: 58px;
+        margin-left: 17px;
+    }
+    .tabStyle {
+        padding: 10px 0 0 40px;
+        border-bottom: medium none;
+        position: auto;
+        background-color: #2c3742;
+        border-radius: 11px 11px 0px 0px;
+        margin-left: 36px;
+    }
+    .tabContent {
+        position: auto;
+        left: 36px;
+        margin-bottom: 60px;
+    }
+}
+/* Landscape tablets and medium desktops */
+
+@media (min-width: 992px) and (max-width: 1199px) {
+    .navbar-nav .navRight {
+        float: left;
+    }
+    .navbar-brand {
+        width: 25%;
+    }
+    .left-projects-links>a {
+        font-size: 13px!important;
+    }
+    .navbar-nav {
+        margin-top: 20px;
+        width: 75%;
+        margin-left: 5px;
+    }
+    #liuserinfo {
+        font-size: 12px;
+    }
+    .jarviswidget>div {
+        font-size: 12px;
+    }
+    #tableinstanceview .moreInfo {
+        margin-left: -6px;
+    }
+    #tableinstanceview .actionbuttonChefClientRundisable {
+        margin-left: -7px!important;
+    }
+    #tableinstanceview .actionbuttonChefClientRun {
+        margin-left: -7px!important;
+    }
+    .jobStyle {
+        margin-top: 15px!important;
+    }
+    #left-panel {
+        min-height: 91.6%!important;
+    }
+    .cpCardStyle {
+        margin-left: 0px!important;
+    }
+    .tabStyle {
+        margin-left: 56px!important;
+        font-size: 12px!important;
+    }
+    .tabContent {
+        margin-left: 22px!important;
+    }
+}
+/* Portrait tablets and small desktops */
+
+@media (min-width: 768px) and (max-width: 991px) {
+    #liuserinfo {
+        display: none!important;
+    }
+    .navbar-brand {
+        width: 29%;
+    }
+    .navRight {
+        float: left;
+    }
+    .navbar-nav {
+        width: 71%;
+    }
+    .left-projects-links>a {
+        font-size: 12px!important;
+    }
+    header {
+        min-height: 6%!important;
+    }
+    #ribbon {
+        min-height: 4%!important;
+    }
+    .jarviswidget>div {
+        font-size: 12px;
+    }
+    .dataTables_wrapper table.table thead .sorting {
+        background: none!important;
+    }
+    #tableinstanceview .moreInfo {
+        margin-left: -6px;
+    }
+    #tableinstanceview .actionbuttonChefClientRundisable {
+        margin-left: -7px!important;
+    }
+    #tableinstanceview .actionbuttonChefClientRun {
+        margin-left: -7px!important;
+    }
+    .panelStyle {
+        width: 80%!important;
+    }
+    .jobStyle {
+        margin-top: 15px!important;
+    }
+    #chefRunlistModal .modal-content {
+        width: 624px!important;
+    }
+    #left-panel {
+        min-height: 94%!important;
+    }
+    #ribbon .breadcrumb {
+        font-size: 12px!important;
+    }
+    .cpCardStyle {
+        margin-left: 0px!important;
+        margin-top: 0px!important;
+        text-align: center;
+    }
+    .tabStyle {
+        margin-left: 0px!important;
+        font-size: 10px!important;
+    }
+    .tabContent {
+        margin-left: -32px!important;
+    }
+}
+.navbar-default .navbar-nav>li>a {
+    color: white!important;
+}
+.pull-left active>a {
+    display: block!important;
+}
+.visibleClass {
+    display: block;
+}
+/********************************************************************* STYLE 1 *************************************************************/
+
+.form-controlSelect {
+    display: inline;
+    width: 100%;
+    height: 32px;
+    padding: 6px 12px;
+    font-size: 13px;
+    line-height: 1.428571429;
+    color: #555;
+    vertical-align: middle;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #ccc;
+    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+    height: 36px;
+}
+@media screen and (min-width: 767px) {
+    .demo1 {
+        display: none;
+    }
+}
+@media (max-width: 1225px) {
+    .table-responsive {
+        border: 1px solid #ddd;
+        margin-bottom: 13.5px;
+        overflow-x: scroll;
+        overflow-y: hidden;
+        width: 100%;
+    }
+}
+@media (max-width: 767px) {
+    #ribbon .breadcrumb {
+        background: none repeat scroll 0 0 rgba(0, 0, 0, 0);
+        display: inline-block;
+        margin: 0;
+        padding: 11px 34px 11px 0 !important;
+        vertical-align: top;
+        margin-left: 36px;
+    }
+}
+/*
+ * Control feature layout
+ */
+
+.provider-images {
+    position: relative;
+    margin: 11px 40px!important;
+    width: 78px;
+    font-size: 12px;
+}
+.customfooter {
+    height: 60px;
+}
+.descriptionMoreInfo {
+    height: 30%;
+    width: 30%;
+    background-repeat: no-repeat;
+    float: left;
+    height: 27px;
+    width: 30px;
+    margin-top: 0px;
+}
+.moreInfo,
+.moreinfoBuild,
+.moreinfoAppDeploy,
+.moreinfoactionHistory,
+.actionbuttonChefClientRun,
+.actionbuttonStart,
+.actionbuttonStartContainer,
+.actionbuttonCPStart,
+.actionbuttonShutdown,
+.actionbuttonShutdownContainer,
+.sshIcon,
+.aws,
+.azure,
+.rl,
+.openstack,
+.hppubliccloud,
+.cloudstack,
+.vmware,
+.dock,
+.logo {
+    background: url(../img/sprites.png) no-repeat;
+}
+.moreInfo {
+    background-position: -15px -12px;
+    width: 27px;
+    height: 27px;
+}
+.moreInfoabsolute {
+    position: absolute;
+    margin-left: -28px;
+}
+.moreinfoBuild {
+    background-position: -15px -12px;
+    width: 25px;
+    height: 25px;
+}
+.moreinfoAppDeploy {
+    background-position: -15px -12px;
+    width: 25px;
+    height: 25px;
+}
+.moreinfoactionHistory {
+    background-position: -15px -12px;
+    width: 25px;
+    height: 25px;
+    margin-left: 28px;
+}
+.actionbuttonChefClientRun {
+    background-position: -59px -10px;
+    width: 28px;
+    height: 28px;
+}
+.actionbuttonStart,
+.actionbuttonStartContainer,
+.actionbuttonCPStart {
+    background-position: -112px -14px;
+    width: 26px;
+    height: 25px;
+}
+.actionbuttonShutdown,
+.actionbuttonShutdownContainer {
+    background-position: -162px -12px;
+    width: 26px;
+    height: 25px;
+}
+.sshIcon {
+    background-position: -206px -9px;
+    width: 34px;
+    height: 28px;
+}
+.aws {
+    background-position: -6px -55px;
+    width: 35px;
+    height: 35px;
+}
+.azure {
+    background-position: -54px -56px;
+    width: 35px;
+    height: 35px;
+}
+.vmware {
+    background-position: -346px -56px;
+    width: 35px;
+    height: 35px;
+}
+.rl {
+    background-position: -107px -55px;
+    width: 35px;
+    height: 35px;
+}
+.openstack {
+    background-position: -156px -56px;
+    width: 35px;
+    height: 35px;
+}
+.hppubliccloud {
+    background-position: -306px -56px;
+    width: 35px;
+    height: 35px;
+}
+.cloudstack {
+    background-position: -207px -57px;
+    width: 35px;
+    height: 35px;
+}
+.dock {
+    background-position: -253px -57px;
+    width: 35px;
+    height: 35px;
+}
+.logo {
+    background-position: -263px -6px;
+    width: 125px;
+    height: 40px;
+}
+.right-button {
+    margin-right: 10px;
+    border-radius: 50%;
+}
+.widget-margin {
+    margin-top: 13px;
+}
+label {
+    color: #444;
+}
+.zero-margin {
+    margin-left: 0px!important;
+    margin-right: 0px!important;
+}
+.custom-scroll {
+    display: block;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    width: 100%;
+    padding: 14px 10px;
+    outline: 0;
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 0;
+    background: #fff;
+    font: 13px/16px 'Open Sans', Helvetica, Arial, sans-serif;
+    color: #404040;
+    appearance: normal;
+    -moz-appearance: none;
+    -webkit-appearance: none;
+}
+.txt-color-red {
+    color: #a90329;
+}
+.logouttop {
+    margin-top: 2px;
+}
+/*Bootstrap Tree-View CSS*/
+
+.list-group-item {
+    cursor: pointer;
+    border: 0px solid #000000 !important;
+    background-color: #2c3638;
+    color: #fff !important;
+    padding: 5px 10px !important;
+}
+span.indent {
+    margin-left: 6px;
+    margin-right: 13px;
+}
+span.expand-collapse {
+    width: 1rem;
+    height: 1rem;
+}
+span.icon {
+    margin-left: 10px;
+    margin-right: 5px;
+}
+.margin-right12 {
+    margin-right: 12px;
+    border-radius: 50%;
+}
+.node-tree:hover {
+    background-color: transparent !important;
+}
+.modal-height {
+    height: 362px;
+}
+.modalbody-height {
+    height: 430px;
+}
+.padding0 {
+    padding: 0px !important;
+}
+.marginForURL {
+    margin-left: -25px;
+    text-align: center;
+    display: block;
+    margin-top: -4px;
+}
+.marginForURLCP {
+    margin-left: -24px;
+    text-align: center;
+    display: block;
+}
+.marginForButtons {
+    margin-right: 15px;
+}
+/*Change for the blueprint coming up when the user launches an instance and the user moves to Instances from Blueprints*/
+
+@media screen and (max-width: 1200px) {
+    .topNew {
+        margin-top: 15px;
+    }
+}
+.btn-importbyIP {
+    top: 7px !important;
+}
+/*CUSTOM FOR LOGS*/
+
+.textLogs {
+    font-weight: normal;
+    color: #000;
+}
+.rowSpacing td {
+    padding-top: 7px;
+}
+.instanceBody {
+    height: 490px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    word-break: break-word;
+}
+.dockerModal {
+    margin-top: 15px;
+}
+.previousModal {
+    margin-left: 12px
+}
+.nextModal {
+    margin-right: 13px;
+}
+.startModal {
+    margin-right: 5px;
+    height: 30px;
+    width: 80px;
+}
+.startBTN {
+    margin-left: 10px;
+}
+.dockerLeft {
+    margin-left: 50px;
+}
+.dockerModalHeight {
+    height: 320px;
+}
+.exitLabel {
+    margin-top: 46px;
+}
+.dockerModalExit {
+    margin-top: 45px;
+}
+.card_os {
+    font-size: 11px;
+    font-weight: bold;
+}
+.widthContainer {
+    width: 16%;
+}
+.dockerLEFT {
+    margin-left: -13px;
+    width: 51.5%;
+}
+.instanceActionBtnCtr >.pending,
+.stopping,
+.unknown {
+    background: url('../img/galleryIcons/rsz_start_icon.png');
+    width: 26px;
+    height: 25px;
+}
+.instanceActionBtnCtr >.running {
+    background: url('../img/galleryIcons/shut_down.png');
+    width: 26px;
+    height: 25px;
+    cursor: pointer;
+}
+.instanceActionBtnCtr >.stopped {
+    background: url('../img/galleryIcons/start_icon.png');
+    width: 26px;
+    height: 25px;
+    cursor: pointer;
+}
+.instanceActionBtnCtr >.shutdown {
+    background: url('../img/galleryIcons/rsz_shut_down.png') !important;
+    width: 26px;
+    height: 25px;
+    cursor: pointer;
+}
+.ipLEFT {
+    margin-left: -13px;
+}
+.ipWidth {
+    margin-top: 15px;
+    width: 52.5%;
+}
+.cpTop {
+    margin-top: 1px;
+}
+.devTOP {
+    margin-top: 2px;
+}
+.widthBox {
+    height: 150px;
+    overflow-y: auto;
+    padding: 2px;
+    border: 1px solid silver;
+    width: 100%;
+    margin-top: 5px;
+}
+.bootboxMODAL {
+    text-align: center;
+    margin-top: 27px;
+}
+.hide_nav {
+    display: none;
+}
+.appDesignNew {
+    margin-top: 10px;
+    margin-right: 12px;
+}
+.treeview .node-selected {
+    font-size: 13px !important;
+    font-weight: bold;
+    background-color: #3b4142 !important;
+}
+.appSeriesHeight {
+    height: 106px;
+}
+.appTop {
+    margin-top: -20px;
+}
+.appUrlInput:hover {
+    border-color: gray;
+}
+.dockerProjPort {
+    margin-top: 20px;
+}
+@media screen and (max-width: 1200px) {
+    .ipWidth {
+        width: 51.2%;
+    }
+    .dockerModalHeight {
+        height: 336px;
+    }
+}
+.dockerIMG {
+    height: 32px;
+    margin-left: -22px;
+    margin-top: 13px;
+    width: auto;
+}
+.marginSubmit {
+    margin-top: 20px;
+    margin-left: 374px;
+}
+.taskLOGS {
+    height: 400px !important;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding-left: 20px;
+    word-break: break-word;
+}
+.chefLOGS {
+    height: 400px !important;
+    overflow-y: auto;
+    overflow-x: hidden;
+    word-break: break-word;
+}
+.projectRepo {
+    margin-top: 10px;
+}
+.jenkinsChefModal {
+    height: 459px;
+}
+.jenkinsChefModalApp {
+    height: 570px;
+}
+.imgMargin {
+    margin-left: -12px;
+}
+.awsExisting {
+    margin-left: -12px;
+    padding-bottom: 7px;
+    padding-top: 7px;
+}
+.awsExisting label {
+    font-size: 14px;
+}
+.blueprintnewbutton{
+    text-align: center;
+    width: 89px;
+}
+.bpeditas{
+    margin-left: -29px;
+}
+.bpvicon{
+    border-radius: 11px;
+    height:25px;
+    width:25px;
+    margin-left: 10px;
+    margin-top: 15px;
+    padding:3px 5px;
+}
+.launchIcon{
+    border-radius: 11px;
+    height:25px;
+    width:25px;
+    margin-left: 0px;
+    margin-top: 15px;
+    padding:3px 5px;
+}
+.cbbpselect{
+    border-radius: 50%;
+    height: 0;
+    margin-left: -46px !important;
+    margin-top: 46px !important;
+    position: absolute;
+}
+.versionModalBody{
+    height: 272px;
+    margin-top: -13px;
+    overflow-x: scroll;
+}
+.selbpv{
+    /*border: 1px solid silver;
+    margin-bottom: 15px;
+    margin-left: 15px;
+    margin-right: 0;
+    width: 162px;*/
+
+}
+.versionoption{
+    border-top: 1px solid #eeeeee;
+    padding-bottom: 7px;
+    padding-top: 7px;
+}
+.labelversion{
+    width:100%;
+}
+/*.versionpopupContainer label{
+    margin-left:15px;
+     margin-top:15px;
+}*/
+.bpvi{
+    margin-left: -6px;
+    margin-top: -7px;
+    position: absolute;
+}
+.bpeditcontainer{
+    padding-top: 15px;
+}
+.modal-vs{
+    width:200px !important;
+}
+.modal-copybp{
+    height: 339px;
+}
+.modal-copybp > label{
+    padding-top: 10px;
+}
+.npbpmsg{
+    text-align: center;
+    width: 100%;
+}
+.dockerimagetext{
+    position: absolute;
+    display: none;
+}
+.appNameLabel {
+    margin-top: 25px;
+}
+.sshStyle {
+    margin-bottom: 4%;
+    font-size: 13px;
+}
+.lblbpc{
+    padding-top:10px;
+}
+.bpcopycount{
+    margin-left: 13px;
+    margin-top: 7px;
+}
+/*Inspect CSS*/
+
+.paraHeightModal {
+    overflow: auto;
+    height: 370px;
+}
+.heightModal400 {
+    height: 400px;
+}
+#containerLazyLoad {
+    height: 300px;
+    overflow: scroll;
+}
+.taskCardIMG {
+    width: auto;
+    height: 24px;
+}
+.customNew {
+    height: 100px!important;
+    width: 100%;
+    overflow-y: auto;
+}
+tr.selectedOne:hover td,
+tr.selectedOne td,
+tr.selectedOne td a {
+    background-color: lightblue!important;
+    color: black!important;
+    font-weight: bold;
+    font-size: 12px;
+}
+.noEnvWarning {
+    margin-top: 150px;
+    float: left;
+    margin-left: 246px;
+    width: 520px;
+    color: black!important;
+    border-color: #40baf1!important;
+    background-color: #fff!important;
+    font-size: 14px;
+}
+.noTrackItems {
+    margin-top: 150px;
+    float: left;
+    margin-left: 246px;
+    width: 480px;
+    color: black!important;
+    border-color: #40baf1!important;
+    background-color: #fff!important;
+    font-size: 14px;
+}
+@media(min-width:1201px) {
+    .bootstrapSuccess {
+        margin-top: 130px;
+        float: left;
+        margin-left: 285px;
+        width: auto;
+        color: black!important;
+        border-color: #40baf1!important;
+        background-color: #fff!important;
+        font-size: 16px;
+    }
+}
+@media(min-width:1550px) {
+    .bootstrapSuccess {
+        margin-top: 130px;
+        float: left;
+        margin-left: 572px!important;
+        width: auto;
+        color: black!important;
+        border-color: #40baf1!important;
+        background-color: #fff!important;
+        font-size: 16px;
+    }
+    .noEnvWarning {
+        margin-top: 150px;
+        float: left;
+        margin-left: 246px;
+        width: 480px;
+        color: black!important;
+        border-color: #40baf1!important;
+        background-color: #fff!important;
+        font-size: 14px;
+    }
+    .noTrackItems {
+        margin-top: 150px;
+        float: left;
+        margin-left: 536px;
+        width: 480px;
+        color: black!important;
+        border-color: #40baf1!important;
+        background-color: #fff!important;
+        font-size: 14px;
+    }
+    .noEnvWarningConsumerDesigner {
+        margin-top: 150px;
+        float: left;
+        margin-left: 530px!important;
+        width: 370px;
+        color: black!important;
+        border-color: #40baf1!important;
+        background-color: #fff!important;
+        font-size: 14px;
+    }
+    .navbar-brand {
+        width: 13.5%!important;
+    }
+    .paramDescription {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        width: auto;
+        display: inline-block;
+        height: 35px;
+    }
+    .dockerImgValue {
+        display: table-cell;
+        height: 35px;
+    }
+}
+@media (min-width: 768px) and (max-width: 1200px) {
+    .bootstrapSuccess {
+        margin-top: 105px;
+        float: left;
+        margin-left: 140px;
+        color: black!important;
+        border-color: #40baf1!important;
+        background-color: #fff!important;
+        font-size: 16px;
+    }
+}
+.bootstrapFailure {
+    margin-top: 150px;
+    float: left;
+    margin-left: 300px;
+    width: 444px;
+    color: black!important;
+    border-color: #ebccd1;
+    background-color: #fff!important;
+    font-size: 16px;
+}
+.dataBagFailure {
+    margin-top: 50px;
+    float: left;
+    margin-left: 300px;
+    width: 440px;
+    color: black!important;
+    border-color: #ebccd1;
+    background-color: #fff!important;
+    font-size: 16px;
+}
+.forBootBox {
+    margin-left: -40px;
+}
+.noEnvWarningConsumerDesigner {
+    margin-top: 150px;
+    float: left;
+    margin-left: 302px;
+    width: 370px;
+    color: black!important;
+    border-color: #40baf1!important;
+    background-color: #fff!important;
+    font-size: 14px;
+}
+/*form validations*/
+
+form.cmxform {
+    font-size: 1.0em;
+    color: #333;
+}
+form.cmxform legend {
+    padding-left: 0;
+}
+form.cmxform legend,
+form.cmxform label {
+    color: #333;
+}
+form.cmxform span.error,
+span.error {
+    color: red;
+    font-style: italic;
+}
+div.error {
+    display: none;
+}
+input {
+    border: 1px solid black;
+}
+input.checkbox {
+    border: none
+}
+form.cmxform .gray * {
+    color: gray;
+}
+@-moz-document url-prefix() {
+    .form-controls {
+        padding: 0px 0px!important;
+    }
+}
+.nodesTable {
+    margin-left: -13px;
+    width: 110%;
+}
+.widthForButton {
+    width: 75%;
+}
+.marginLeft50 {
+    margin-left: 50px;
+}
+.importButton {
+    float: left!important;
+    margin-top: 3px;
+    margin-right: 14px;
+}
+#jobParamTable>tbody>tr>td.jobParam {
+    width: 24%!important;
+    padding-top: 17px!important;
+}
+#jobParamTable td {
+    border-top: none;
+}
+#booleanTable>tbody>tr>td.booleanParam {
+    width: 20%!important;
+    padding-top: 17px!important;
+}
+#booleanTable td {
+    border-top: none;
+}
+#booleanTable thead th.headParamTable {
+    width: 44%!important;
+}
+#stringTable>tbody>tr>td.stringParam {
+    width: 20%!important;
+    padding-top: 17px!important;
+}
+#stringTable thead th.headStringTable {
+    width: 44%!important;
+}
+#stringTable td {
+    border-top: none;
+}
+.stack-details-list {
+    font-size: 10px;
+    padding-bottom: 0px;
+    padding-top: 5px;
+    text-align: center;
+}
+.stack-details {
+    display: block;
+}
+.stackId {
+    width: 100px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.stackCardDiv {
+    position: relative;
+    border-width: 1px;
+}
+.instanceloaderspinner {
+    background-color: #fff;
+    border: 1px solid black;
+    height: 50px;
+    left: 50%;
+    padding-top: 14px;
+    position: fixed;
+    text-align: center;
+    top: 50%;
+    width: 200px;
+    z-index: 99999;
+}
+.instanceloaderspinner>img {
+    margin-right: 5px;
+}
+#tabInstanceStatus {
+    font-size: small;
+    margin-top: 21px;
+    text-align: center;
+}
+.stackInfo {
+    background: url(../img/sprites.png) no-repeat;
+    background-position: -15px -12px;
+    width: 25px;
+    height: 25px;
+    background-repeat: no-repeat;
+    float: left;
+    margin-top: 0px;
+}
+.stackLogo {
+    height: 52px;
+    padding-top: 11px;
+    margin-top: 9px;
+    margin-left: 44px;
+}
+.marginleftright7 {
+    margin-left: 3px;
+    margin-right: 7px;
+}
+.serviceClass {
+    float: left;
+    margin-top: 7px;
+    margin-left: 20px;
+}
+@media (min-width: 768px) and (max-width: 1200px) {
+    .swap-view {
+        margin-top: -32px;
+    }
+}
+.paramDescription {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 147px;
+    display: inline-block;
+    height: 35px;
+}
+.dockerImgValue {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 250px;
+    display: inline-block;
+    height: 42px;
+}
+.paramValue {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 146px;
+    height: 35px;
+    display: inline-block;
+}
+.paramName {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 147px;
+    height: 35px;
+}
+.widgetColor {
+    color: #4e5964;
+}
+.widgetHeight {
+    min-height: 300px!important;
+}
+.tablePadding {
+    padding-left: 0px!important;
+    padding-right: 0px!important;
+}
+.textCenter {
+    text-align: center;
+}
+.imageIdentifier {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 147px;
+    display: inline-block;
+    height: 35px;
+}
+.trLineHeight {
+    line-height: 2.3;
+}
+.spinnerStyle {
+    height: 50px;
+    width: 50px;
+    margin-top: 10%;
+    margin-bottom: 10%;
+}
+.card2 {
+    display: block;
+    height: 100%;
+    width: 100%;
+    border-radius: 15px;
+    color: white;
+    text-align: center;
+    font-weight: bold;
+    font-size: 14px;
+    position: absolute;
+    transition: all 0.5s linear;
+    backface-visibility: hidden;
+}
+.card2.flipped2 {
+    -ms-transform: rotateY(360deg);
+    transform: rotateY(360deg);
+}
+.front2 {
+    background: #363636;
+}
+
+.back2 {
+    background: #996633;
+    transform: rotateY( 180deg);
+}
+.card3 {
+    display: block;
+    height: 100%;
+    width: 100%;
+    border-radius: 15px;
+    color: white;
+    text-align: center;
+    font-weight: bold;
+    font-size: 14px;
+    position: absolute;
+    transition: all 0.5s linear;
+    backface-visibility: hidden;
+}
+.front3 {
+    background: #FFCC00;
+}
+.paramStyle{
+    width:11%!important;
+    text-align:center!important;
+}
+.valueStyle{
+    width:27%!important;
+    text-align:center!important;
+}
+.tdStyleInfo{
+    padding-left:18px!important;
+    padding-top:16px!important;
+}
+.modalHeightHelp{
+    height:480px;overflow-y:auto
+}
+.leftSpaceStyle{
+    height:40px;background-color:#40baf1;color:white;border-right:1px solid silver;
+}
+.treeStyle{
+    margin-top:0px;font-size:11pt;font-weight:bold;padding-left:10px;padding-top:10px
+}
+.activeProviderOpen{
+    background-color:#40baf1;margin-right:1px;
+}
+.configureVM{
+    float:right;
+    margin-top:36px;
+    margin-right: 16px;
+}
+.margintopMinus5{
+    margin-top:-5px !important;
+}
+.colorRed{
+    color:red;
+}
+
+#selectOrgName{
+    width:56%;
+}
+@media(max-width:978px){
+    #selectOrgName{
+        width:48%;
+    }
+    .orgSelectDropDown{
+        font-size: 11px;
+    }
+    .spanName{
+        width:43%;
+        margin-top: -40px;
+    }
+
+}
+@media(min-width:979px) and (max-width:1199px){
+    .spanName{
+        width:40%;
+        margin-top:-40px;
+    }
+}
+@media(min-width:1200px) and (max-width:1400px){
+    .spanName{
+        width:30%;
+        margin-top:-40px;
+    }
+}
+@media(min-width:1401px){
+    .spanName{
+        width:26%;
+        margin-top:-40px;
+    }
+}
+/*Class added in Dev Angular to show the blue color for active classes.*/
+.custom-theme .left-projects-links > a.active i {
+    color:#40baf1 !important;
+}
+
+.choose-file {
+    padding: 4px 8px;
+    background: #f1f1f1;
+    border-radius: 5px;
+    font-weight: normal;
+    border: 1px solid gray;
+}
+.file-name {
+    max-width: 160px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    float: left;
+    margin-top: 5px;
+    margin-left: 5px;
+}
+
+/* compsiteBlueprint*/
+#compositeBlueprintLoadBlueprint{
+    margin: 0 auto;
+    width: 100%;
+}
+#optionSelector, #selectorList {
+    width: 100%;
+    height: 250px;
+}
+
+.selectCookbooksandRecipesdivLeft, .selectCookbooksandRecipesdivRight {
+    width: 79%;
+}
+.blueprintClass {
+    background-repeat: no-repeat;
+    height: 30px;
+    padding-left: 34px;
+    padding-top: 10px;
+    background-position: 7px 9px !important;
+    font-size: 12px;
+    background: url("../img/rsz_layers.png") no-repeat;
+
+}
+.section-headings{
+    color: #444;
+    font-size: 15px;
+    font-weight: normal;
+}
+
+#btnaddToBlueprint , #btnremoveFromBlueprint {
+    padding: 5px 10px;
+}
+
+#btnBlueprintItemUp, #btnBlueprintItemDown {
+    padding: 5px 8px;
+}
+
+.compositeBPVersion{
+    float:right;
+    margin-right: 30px;
+    margin-top: 4px;
+}
+.compositeBPVersion select {
+    height: 26px !important;
+    display:inline !important;
+    width: auto !important;
+    padding: 0px 12px !important;
+}
+.marginTop19{
+    margin-top:19px
+}
+fieldset#compBlueprint{
+    border: 1px groove #ddd;
+    padding: 0 1.4em 1.4em 1.4em;
+    margin: 2em 0 1.5em 0;
+    -webkit-box-shadow:  0px 0px 0px 0px #000;
+    box-shadow:  0px 0px 0px 0px #000;
+}
+fieldset#compBlueprint legend {
+    font-size: 1.2em;
+    font-weight: bold;
+    text-align: left;
+    border:none;
+    width:170px;
+    color: #3a87ad;
+    margin: 0;
+}
+.paddingleft {
+    padding-left: 20px;
+}
+.paddingleft-13{
+    padding-left: 13px;
+}
+.labelHorizontal {
+    font-size: 15px;
+    color: #444;
+    padding:5px 0 0 15px;
+}
+
+
+input, select, textarea {
+    vertical-align: middle;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #ccc;
+    border-radius: 0;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+    -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+}
+
+input:focus, select:focus, textarea:focus {
+    border-color: #66afe9;
+    outline: 0;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, 0.6);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, 0.6);
+
+}
+
+#compBlueprint legend {
+    display: block;
+    -webkit-padding-start: 2px;
+    -webkit-padding-end: 2px;
+    border: none;
+    width: auto !important;
+}
+
+#createProvider .marginbottom {
+    margin-bottom: 10px;
+}
+
+#createProvider .width-60 {
+    width: 60%;
+}
+
+#createProvider .width-20 {
+    width: 20%;
+}
+
+#createProvider .addimage,.removeimage {
+    cursor: pointer;
+}
+
+#createProvider .addNewRegion {
+    border: solid gray 1px;
+    padding: 10px;
+    margin-bottom: 15px;
+}
+
+#createProvider .addRow,.removeRow {
+    float: left;
+    margin-top: 32px;
+    margin-left: 3.5px;
+}
+
+#createProvider .addRegion,.removeRegion {
+    position: relative;
+    top: -18px;
+    left: 17px;
+    float: right;
+}
+
+#createProvider .row {
+    margin-bottom: 0px;
+}
+.azureBlock{
+    margin-top: 0px;
+}
+.tooltipMargin{
+    margin-top:2px; margin-left:2px;
+}
+.margintop5{
+    margin-top: 5px;
+}
+#editRunlistParam{
+    height: auto;
+}
+#attributeRunlistTable{
+    padding-left: 8px;
+}
+#tableRunlistForBlueprint{
+    text-align: center;
+    width: 100%;
+}
+#tableRunlistForBlueprint thead tr th{
+    text-align: center;
+    width: 319px;
+}
+.scriptContainerRead {
+    height:400px;
+    overflow-y:auto; 
+    background: #333;
+    color:#fff;
+    font-size: 12px;
+    white-space: pre-wrap;
+    display: block;
+}
+
+.blueprintdiv-aws {
+    width:77%!important;
+}
diff --git a/client/htmls/private/index.html b/client/htmls/private/index.html
index c97388058..2f267ef4d 100644
--- a/client/htmls/private/index.html
+++ b/client/htmls/private/index.html
@@ -85,6 +85,8 @@
           <div class="hiddencollapse treeStyle">TRACK</div>
         </div>
         <div id="trackTree" class="font-size-12"></div>
+        <div id="trackzoomicon" class="zoomout trackzoomicondiv hidden" onclick="zoomdashboard(this);">
+        </div>
       </div>
       <!--track ends here-->
       <div id="Settings_nav" style="display:none;">
@@ -942,6 +944,38 @@ <h4 class="modal-title">
                 "selectable": true,
                 "icon": "fa fa-lg fa-fw fa-link"
 
+            },{
+                "name": "organizations",
+                "text": "Code Repo",
+                "borderColor": "#000",
+                "href": "#ajax/Settings/BitbucketConfigList.html",
+                "selectable": true,
+                "icon": "fa fa-lg fa-fw fa-bitbucket"
+
+            },{
+                "name": "organizations",
+                "text": "Octopus",
+                "borderColor": "#000",
+                "href": "#ajax/Settings/OctopusConfigList.html",
+                "selectable": true,
+                "icon": "fa fa-lg fa-fw fa-code"
+
+            },{
+                "name": "organizations",
+                "text": "Jira",
+                "borderColor": "#000",
+                "href": "#ajax/Settings/JiraConfigList.html",
+                "selectable": true,
+                "icon": "fa fa-lg fa-fw fa-ticket"
+
+            },{
+                "name": "organizations",
+                "text": "QA Portal",
+                "borderColor": "#000",
+                "href": "#ajax/Settings/FunctionalTestConfigList.html",
+                "selectable": true,
+                "icon": "fa fa-lg fa-fw fa-check"
+
             }, {
                 "name": "organizations",
                 "text": "Providers",
@@ -1182,11 +1216,28 @@ <h4 class="modal-title">
             event.stopPropagation();
             event.preventDefault();
             event.stopPropagation();
+            if(node['data-href'].indexOf('#/dashboard/') > 0){
+             // alert('yep' + node['data-href']);
+              $('#trackzoomicon').append('[+]').attr('title','Maximize').toggleClass('hidden',6500);
+
+            }
             return false;
         }
     });
 }
 
+var zoomdashboard = function(icondiv){
+  //find out if zoom-out or in
+  $('body').toggleClass('zoom');
+  if($('body').hasClass('zoom')){ //zoomed
+      $('#trackzoomicon').empty().append('[-]').attr('title','Restore');
+  }
+  else{
+    $('#trackzoomicon').empty().append('[+]').attr('title','Maximize');
+  }
+}
+
+
 var treeData;
 
 function getTreeData() {
diff --git a/client/htmls/private/index.html.bak b/client/htmls/private/index.html.bak
new file mode 100644
index 000000000..c97388058
--- /dev/null
+++ b/client/htmls/private/index.html.bak
@@ -0,0 +1,1465 @@
+<!DOCTYPE html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <title>Catalyst</title>
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap.css">
+    <link rel="stylesheet" type="text/css" media="screen" href="css/catalyst.css">
+    <link rel="stylesheet" type="text/css" media="screen" href="css/smartCustom.min.css">
+    <link rel="stylesheet" type="text/css" media="screen" href="css/jqueryUI.min.css">
+    <link rel="stylesheet" type="text/css" media="screen" href="css/font-awesome.min.css">
+    <link rel="stylesheet" href="js/jquery-filetree/jqueryFileTree.css" />
+    <link rel="stylesheet" type="text/css"  href="css/toastr.min.css">
+  </head>
+  <body class="custom-theme">
+    <!-- HEADER -->
+    <!-- Header starts here -->
+    <header>
+      <nav class="navbar navbar-default">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          </button>
+        </div>
+        <div class="navbar-brand"><img src="img/logo.png" class="iconLogo" alt="logo"></div>
+        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+          <!--left side navbar-->
+          <ul class="nav navbar-nav">
+            <li class="left-projects-links hidden" data-target="#Workspace" navigation="Workspace,Workspace1">
+              <a class="active navigationTab" id="workZoneNew" href="#" onclick="setleftnavigation(this,'org');">
+              <i class="fa fa-credit-card"></i>&nbsp;WORKZONE 
+              </a>
+            </li>
+            <!--design starts here-->
+            <li class="left-projects-links hidden" id="designStyle" data-target="#blueprints"  navigation="blueprints">
+              <a href="#ajax/Aws-Production.html" id="designNew" onclick="setleftnavigation(this,'Design');" class="navigationTab">
+              <i class="fa fa-puzzle-piece"></i>&nbsp;DESIGN
+              </a>
+            </li>
+            <!--track-->
+            <li class="left-projects-links hidden" id="trackStyle" data-target="#Track" navigation="Track">
+              <a class="dropdown-toggle navigationTab" href="#ajax/trackSettings.html" id="trackNew"  onclick="setleftnavigation(this,'Track');"><i class="fa fa-anchor"></i>&nbsp;TRACK</a>
+            </li>
+            <!--track ends here-->
+            <!--right side navbar-->
+            <span class="navRight">
+              <li class="left-projects-links active" id="liuserinfo"></li>
+              <!--Settings tab-->
+              <li class="left-projects-links hidden" data-target="#Settings"   navigation="Settings">
+                <a class="dropdown-toggle navigationTab" href="#ajax/Settings/Dashboard.html" id="settingsNew"  onclick="setleftnavigation(this,'Settings');"><i class="fa fa-cog"></i>&nbsp;SETTINGS</a>
+              </li>
+              <!--help-->
+              <li class="left-projects-links"><a href="https://catalyst.readthedocs.org" target="_blank" id="dokuNew"><i class="fa fa-question"></i>&nbsp;Help</a>
+              </li>
+              <!--logout-->
+              <li id="logout" class="btn-header transparent pull-right logouttop">
+                <!-- ../auth/signout -->
+                <span><a href="#" logoutlink="/auth/signout" title="Sign Out">
+                <i class="fa fa-sign-out"></i>
+                </a></span>
+              </li>
+            </span>
+          </ul>
+        </div>
+      </nav>
+    </header>
+    <!--HEADER ends here -->
+    <!-- Left panel : Navigation area -->
+    <aside id="left-panel">
+      <div id="Workspace1">
+        <div class="leftSpaceStyle">
+          <!--workzone hidden so that while navigating from angular workzone to any other jquery page the workzone on the left panel shouldn't show up-->
+          <div class="hiddencollapse treeStyle hidden">WORKZONE</div>
+        </div>
+        <div id="tree" class="font-size-12"></div>
+      </div>
+      <!--for track-->
+      <div id="trackShow" style="display:none;">
+        <div class="leftSpaceStyle">
+          <div class="hiddencollapse treeStyle">TRACK</div>
+        </div>
+        <div id="trackTree" class="font-size-12"></div>
+      </div>
+      <!--track ends here-->
+      <div id="Settings_nav" style="display:none;">
+        <div class="leftSpaceStyle">
+          <div class="hiddencollapse treeStyle">SETTINGS</div>
+        </div>
+        <div id="setting_tree" class="font-size-12"></div>
+      </div>
+      <nav class="font-size-12">
+        </ul>
+        <ul class="menu-item-parentdemo" id="Workspace">
+        </ul>
+        <ul class="menu-item-parentdemo hidden" id="Track">
+        </ul>
+        <ul class="menu-item-parentdemo hidden" id="blueprints" providerselected="aws">
+          <li class="active open">
+            <a href="#" class="activeProviderOpen"><i class="fa fa-lg fa-fw fa-sitemap"></i><span class="menu-item-parent trackAlign"><strong>PROVIDERS</strong></span>
+            </a>
+            <ul class="visibleClass">
+              <li>
+                <a href="ajax/Aws-Production.html" onclick="$('#blueprints').attr('providerselected','aws');" class="devops_providers">
+                  <div class="aws" title="AWS"><span class="menu-item-parent provider-images trackAlign">&nbsp;&nbsp;AWS</span></div>
+                </a>
+              </li>
+              <li>
+                <a href="ajax/DesignBlueprintAzure.html?provider=azure" onclick="$('#blueprints').attr('providerselected','azure');"  class="devops_providers">
+                  <div class="azure" title="Azure"><span class="menu-item-parent provider-images trackAlign">&nbsp;&nbsp;AZURE</span></div>
+                </a>
+              </li>
+              <li>
+                <a href="ajax/DesignBlueprint.html?provider=os" onclick="$('#blueprints').attr('providerselected','openstack');"  class="devops_providers">
+                  <div class="openstack" title="Open Stack"><span class="menu-item-parent provider-images trackAlign">&nbsp;OPENSTACK</span></div>
+                </a>
+              </li>
+              <li>
+                <a href="ajax/DesignBlueprintVmware.html?provider=vmware" onclick="$('#blueprints').attr('providerselected','vmware');" class="devops_providers">
+                  <div class="vmware" title="Vmware"><span class="menu-item-parent provider-images trackAlign">&nbsp;VMWARE</span></div>
+                </a>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </nav>
+      <span class="minifyme"> <i class="fa fa-arrow-circle-left hit"></i> </span>
+    </aside>
+    <!-- END NAVIGATION -->
+    <!-- MAIN PANEL -->
+    <div id="main" role="main">
+      <!-- RIBBON -->
+      <div id="ribbon">
+        <div class="demo1">
+          <div id="hide-menu" style="margin-top:-3px;">
+            <span> <a href="javascript:void(0);" title="Collapse Menu">
+            <i class="fa fa-sitemap txt-color-lightwhite"></i></a> </span>
+          </div>
+        </div>
+        <!-- breadcrumb -->
+        <ol class="breadcrumb">
+          <!-- This is auto generated -->
+        </ol>
+      </div>
+      <!-- MAIN CONTENT -->
+      <div id="content">
+      </div>
+      <!--hiding the comment for no org available when the organization and environments are present-->
+      <div id="noenvwarning" class="hidden alert alert-warning noEnvWarning">
+        <img style="width:50px;height:40px" src="img/warning.png" alt="warning"/><span style="margin-left:20px;">Please Configure your Chef Server &amp; Environments. Check your</span>
+        <ul style="list-style-type:none;text-align:center">
+          <li class="left-projects-links hidden" data-target="#Settings" navigation="Settings">
+            <a class="navigationTab" href="#ajax/Settings/Dashboard.html" id="settingsNewClick"  onclick="setleftnavigation(this,'Settings');">&nbsp;SETTINGS</a>
+          </li>
+        </ul>
+      </div>
+      <!--noEnv Error for consumer and designer-->
+      <div id="noEnvError" class="hidden alert alert-warning noEnvWarningConsumerDesigner"><img style="width:50px;height:40px" src="img/warning.png" alt="warning"/><span style="margin-left:20px;">There are no Workzone items to display.</span>
+      </div>
+      <!--error ends-->
+      <!-- END MAIN CONTENT -->
+    </div>
+    <!-- END MAIN PANEL -->
+    <div id="shortcut" style="margin-left: 100px;margin-top: 90px;">
+      <ul class="orgsList">
+      </ul>
+    </div>
+    <!-- END SHORTCUT AREA -->
+    <div id="main-collapse" style="margin-top: 50px;">
+      <ul class="" style="width:100%">
+        <li class="collapseActive">
+          <a href="#ajax/Dev.html">WORKZONE</a>
+        </li>
+        <li>
+          <a href="#ajax/Aws-Production.html">DESIGN</a>
+        </li>
+        <li>
+          <a href="#ajax/Settings/OrgList.html"><span>SETTINGS</span></a>
+        </li>
+      </ul>
+    </div>
+    <!--modal for instance edit-->
+    <div class="modal fade" id="modalforInstanceEdit" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <form role="form" class="cmxform" id="instanceEditNew">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+              <h4 class="modal-title">
+                &nbsp;Edit Instance Name
+              </h4>
+            </div>
+            <div class="modal-body">
+              <fieldset>
+                <div class="col-lg-6 col-md-6 col-sm-6">
+                  <label for="instanceEditName">Name<span class="control-label redSpan">&nbsp;*</span></label>
+                  <input type="text" name="instanceEditName" class="form-control" id="instanceEditName" autofocus/>
+                </div>
+                <input type="hidden" id="instanceIDHiddenInput">
+              </fieldset>
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+              <input type="submit" id="editSaveBTN" class="btn btn-primary" value="Save" />
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+    <!--modal for instance edit ends-->
+    <!--modal for blueprint read-->
+    <div class="modal fade bs-example-modal-lg" id="modalForRead" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+            <h4 class="modal-title" id="myModalLabel"></h4>
+          </div>
+          <div class="modal-body modalHeightHelp">
+            <!--os and the 1st tier-->
+            <table class="table table-bordered">
+              <thead>
+                <th class="paramStyle">Parameters</th>
+                <th class="valueStyle">Values</th>
+              </thead>
+              <tbody>
+                <tr>
+                  <td class="tdStyleInfo">Blueprint Name:</td>
+                  <td>
+                    <input  id="blueprintNameInputNew" disabled="disabled" class="form-control">
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">Template Type:</td>
+                  <td>
+                    <input id="blueprintTemplateType" disabled="disabled" class="form-control">
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">Organisation Name:</td>
+                  <td>
+                    <input id="blueprintORG" disabled="disabled" class="form-control">
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">Business Group:</td>
+                  <td>
+                    <input id="blueprintBU" disabled="disabled" class="form-control">
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">Project Name:</td>
+                  <td>
+                    <input id="blueprintProject" disabled="disabled" class="form-control">
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">Operating System:</td>
+                  <td>
+                    <input id="instanceOSNew" class="form-control" disabled="disabled">                                                      
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">Instance Type:</td>
+                  <td>
+                    <input id="instancesizeNew" disabled="disabled" class="form-control">
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">Provider Type:</td>
+                  <td>
+                    <input id="instanceProviderType" disabled="disabled" class="form-control">
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">Provider Name:</td>
+                  <td>
+                    <input id="instanceProviderName" disabled="disabled" class="form-control">
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">Region:</td>
+                  <td>
+                    <input id="instanceRegion" disabled="disabled" class="form-control">
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">Image:</td>
+                  <td>
+                    <input id="instanceImage" disabled="disabled" class="form-control">
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">Keypair:</td>
+                  <td> 
+                    <input id="instancekeyPair" disabled="disabled" class="form-control">
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">VPC ID:</td>
+                  <td>
+                    <input id="instanceVPC" class="form-control" disabled="disabled">                                               
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">Subnet:</td>
+                  <td>
+                    <input id="instanceSubnetId" class="form-control" disabled="disabled">                                          
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">Security Group:</td>
+                  <td>
+                    <input id="instanceSecurityGroupId" class="form-control" disabled="disabled">
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">Version:</td>
+                  <td>
+                    <input id="instanceVersion" class="form-control" disabled="disabled">                                    
+                  </td>
+                </tr>
+                <tr>
+                  <td class="tdStyleInfo">Runlist:</td>
+                  <td>
+                    <input id="instanceRunlist" class="form-control" disabled="disabled">                                           
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-default btn-primary" data-dismiss="modal">Close</button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!--modal for blueprint edit read-->
+    <!--modal for blueprint read-->
+    <div class="modal fade bs-example-modal-lg" id="modalForReadCFT" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+            <h4 class="modal-title" class="titleCFTDocker" id="myModalLabel"></h4>
+          </div>
+          <div class="modal-body">
+            <fieldset>
+              <!--os and the 1st tier-->
+              <table class="table table-bordered">
+                <thead>
+                  <th class="paramStyle">Parameters</th>
+                  <th class="valueStyle">Values</th>
+                </thead>
+                <tbody>
+                  <tr>
+                    <td class="tdStyleInfo">Blueprint Name:</td>
+                    <td>
+                      <input  id="blueprintNameCFT" disabled="disabled" class="form-control">
+                    </td>
+                  </tr>
+                  <tr>
+                    <td class="tdStyleInfo">Template Type:</td>
+                    <td>
+                      <input id="blueprintTemplateTypeCFT" disabled="disabled" class="form-control">
+                    </td>
+                  </tr>
+                  <tr>
+                    <td class="tdStyleInfo">Organisation Name:</td>
+                    <td>
+                      <input id="blueprintORGCFT" disabled="disabled" class="form-control">
+                    </td>
+                  </tr>
+                  <tr>
+                    <td class="tdStyleInfo">Business Group:</td>
+                    <td>
+                      <input id="blueprintBUCFT" disabled="disabled" class="form-control">
+                    </td>
+                  </tr>
+                  <tr>
+                    <td class="tdStyleInfo">Project Name:</td>
+                    <td>
+                      <input id="blueprintProjectCFT" disabled="disabled" class="form-control">
+                    </td>
+                  </tr>
+                  <tr>
+                  <td class="tdStyleInfo">Version:</td>
+                  <td>
+                    <input id="instanceVersion" class="form-control" disabled="disabled">                                    
+                  </td>
+                </tr>
+                </tbody>
+              </table>
+            </fieldset>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-default btn-primary" data-dismiss="modal">Close</button>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!--modal for blueprint launch parameters -->
+     <div class="modal fade bs-example-modal-lg" id="modalSelectEnvironment" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+       <div class="modal-dialog">
+         <div class="modal-content">
+           <div class="modal-header">
+             <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+             <h4 class="modal-title" id="myModalLabel"><i class="fa fa-list-ol txt-color-blue"></i>&nbsp;Select Blueprint Launch Parameters</h4>
+           </div>
+           <div class="modal-body">
+           <fieldset>
+             <div class="col-lg-6 col-md-6">
+                 <label for="">Organization</label>
+                 <input id="blueprintOrgEnv" disabled="disabled" class="form-control">
+             </div>
+             <div class="col-lg-6 col-md-6">
+                 <label for="" class="">Business Group</label>
+                 <input id="blueprintBuEnv" disabled="disabled" class="form-control">
+             </div>
+             <div class="col-lg-6 col-md-6 projectRepo">
+                 <label for="" class="">Project Name
+                 </label>
+                 <input id="blueprintProEnv" disabled="disabled" class="form-control">
+             </div>
+             <div class="col-lg-6 col-md-6 projectRepo">
+                 <label for=""  class="">Choose Environment:</label>
+                 <label id="spinnerForEnv" class="hidden"><img  style="margin-left:5px;margin-right:25px;" src="img/select2-spinner.gif"></label>
+                 <select id="envSelect" class="width-100 form-control">
+                 </select>
+             </div>
+             <input type="hidden" id="selectedVersion"/>
+           </fieldset>         
+             </div>
+             <div class="modal-footer">
+                 <a type="button" class="btn btn-default btn-default" data-dismiss="modal">Close</a>
+                 <button type="button" class="btn btn-default btn-primary launchBlueprintBtn" data-dismiss="modal">Launch</button>
+              </div>
+         </div>
+       </div>
+     </div>
+     <!--modal ends here-->
+
+<!--instance launching pad-->
+<div class="modal fade" id="instanceLogModalContainer" tabindex="-1" style='z-index:1800' role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+   <div class="modal-dialog">
+      <div class="modal-content">
+         <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+            <h4 class="modal-title" id="myModalLabel">
+               <i class="fa fa-bar-chart-o txt-color-blue"></i>&nbsp;&nbsp;Instance Logs
+            </h4>
+         </div>
+         <div class="modal-body">
+            <div class="logsArea font-size-12"></div>
+         </div>
+         <div class="modal-footer">
+            <button type="button" class="btn btn-default btn-primary" data-dismiss="modal">Close</button>
+         </div>
+      </div>
+   </div>
+</div>
+
+<!--modal for launching the blueprint-->
+<div class="modal fade" id="launchResultContainer" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+   <div class="modal-dialog">
+      <div class="modal-content">
+         <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+            <h4 class="modal-title" id="myModalLabel">Launching Blueprint</h4>
+         </div>
+         <div class="modal-body">
+            ...
+         </div>
+         <div class="modal-footer">
+            <button type="button" class="btn btn-default btn-primary" data-dismiss="modal">Close</button>
+         </div>
+      </div>
+   </div>
+</div>
+<!--modal for blueprint laucnh ends here-->
+<!--modal for CFT launch-->
+<div class="modal fade" id="cftContainer" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+  <div class="modal-dialog">
+    <div class="modal-content">
+       <form role="form" class="cmxform" id="cftForm">
+          <div class="modal-header">
+             <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+             <h4 class="modal-title" id="myModalLabel">Enter a Unique Stack Name?</h4>
+          </div>
+          <div class="modal-body">
+             <i>(Only numbers,letters allowed. No spaces and underscores)</i>
+             <input type="text" uniqueconditionedby="cftInput" class="form-control" autofocus name="cftInput" id="cftInput"/>
+          </div>
+          <div class="modal-footer">
+             <a type="button" class="btn btn-default" data-dismiss="modal">Close</a>
+             <input type="submit" class="btn btn-default btn-primary" value="Submit">
+          </div>
+       </form>
+    </div>
+  </div>
+</div>
+    <!--modal for CFT Launch ends here-->
+    <!--launching docker parameters-->
+<div class="modal fade bs-example-modal-lg" id="launchDockerInstanceSelector" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content">
+      <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+          <h4 class="modal-title" id="DockerLaunch">Launch Docker Blueprint</h4>
+      </div>
+      <div class="modal-body">
+          <section id="wizard">
+              <form id="commentForm" action="">
+                  <div id="rootwizard">
+                      <ul style="display:none">
+                          <li><a href="#dockerTab1" data-toggle="tab">First</a></li>
+                          <li><a href="#dockerTab2" data-toggle="tab">Second</a></li>
+                      </ul>
+                      <div class="tab-content">
+                          <div class="tab-pane" id="dockerTab1">
+                              <div style="margin:0px;">
+                                  <div class="col-lg-12 col-md-12 fordocker" style="margin-top:5px;">
+                                      <label for="category">Docker Images:
+                                          </label>
+                                      <a class="btn btn-primary adddockertemplate pull-right hidden" onclick="showdockertemplateadder();">Add</a>
+                                      <table class="table table-striped table-bordered table-hover dataTable no-footer" id="compositeDockerImagesTable" cellpadding="5px" width="100%">
+                                          <tr>
+                                              <th>Order</th>
+                                              <th>Name</th>
+                                              <th>Image Path</th>
+                                              <th>Tag</th>
+                                              <th>Launch Params</th>
+                                              <th>Action</th>
+                                          </tr>
+                                      </table>
+                                  </div>
+                              </div>
+                          </div>
+                          <div class="tab-pane" id="dockerTab2">
+                              <div id="dockerinstancesselctorview" style="margin-top: 26px;">
+                                  <table class="table table-striped table-bordered table-hover dataTable no-footer" id="dockerinstancesTable" cellpadding="5px" width="100%">
+                                      <thead>
+                                          <tr>
+                                              <th class="text-center">Select Instance</th>
+                                              <th class="text-center">Instance Name</th>
+                                              <th class="text-center">IP Address</th>
+                                              <th class="text-center">Log</th>
+                                          </tr>
+                                      </thead>
+                                      <tbody></tbody>
+                                  </table>
+                              </div>
+                              <div class="btn-group">
+                                  <a type="button" class="btn btn-default btn-primary hidden" data-dismiss="modal">Close</a>
+                              </div>
+                          </div>
+                          <ul class="pager wizard">
+                              <li class="previous disabled"><a href="javascript:void(0);" class="btn btn-primary dockerModal previousModal" style="border-radius:0px">Previous</a></li>
+                              <li class="next"><a href="javascript:void(0);" class="btn btn-primary dockerModal nextModal" style="border-radius:0px;margin-left:5px;">Next</a></li>
+                              <button type="button" class="btn btn-primary nav nav-pills dockerinstancestart hidden dockerModal startModal"><span class="startBTN">Start</span></button>
+                          </ul>
+                      </div>
+                  </div>
+              </form>
+          </section>
+      </div>
+    </div>
+  </div>
+</div>
+    <!--launching docker parameter ends here-->
+
+<div class="modal fade bs-example-modal-lg" id="myModalLabelDockerContainer" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content">
+      <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+          <h4 class="modal-title" id="DockerLaunch">Launch Parameters-Docker Blueprints</h4>
+      </div>
+      <div class="modal-body dockerModalHeight">
+          <section>
+              <form id="dockerparamsform" action="">
+                  <div style="margin:0px;">
+                      <div class="col-lg-6 col-md-6">
+                          <label for="category">Container Name<span style="color:red">*</span><span class="dockerparamrequired hidden" style="color:red">&nbsp;Required</span>
+                          </label>
+                          <input type="text" id="Containernamefield" name="namefield" class="required form-control" placeholder="" dockerparamkey="--name" onclick="$('.dockerparamrequired').addClass('hidden')">
+                      </div>
+                      <div class="col-lg-6 col-md-6">
+                          <label for="category">Port Mappings</label>
+                          <input type="text" id="Portmappingfield" name="Portmappingfield" class=" form-control" placeholder="Map host ports to container ports" dockerparamkey="-p">
+                      </div>
+                      <div class="col-lg-6 col-md-6 dockerModal">
+                          <label for="category">Volumes</label>
+                          <input type="text" id="Volumesfield" name="Volumesfield" class=" form-control" placeholder="Map host folders to container folders" dockerparamkey="-v">
+                      </div>
+                      <div class="col-lg-6 col-md-6 dockerModal">
+                          <label for="category">Volumes-from</label>
+                          <input type="text" id="Volumes-fromfield" name="Volumes-fromfield" class=" form-control" placeholder="Comma separated container names" dockerparamkey="--volumes-from">
+                      </div>
+                      <div class="col-lg-6 col-md-6 dockerModal">
+                          <label for="category">Linked Container</label>
+                          <input type="text" id="Linkedcontainerfield" name="Linkedcontainerfield" class=" form-control" placeholder="The name of a container this one links to" dockerparamkey="--link">
+                      </div>
+                      <div class="col-lg-6 col-md-6 dockerModal">
+                          <label for="category">Environment Variables</label>
+                          <input type="text" id="Environmentvariablesfield" name="Environmentvariablesfield" class=" form-control" placeholder="" dockerparamkey="-e">
+                      </div>
+                      <div class="col-lg-6 col-md-6 dockerModal">
+                          <label for="category">Startup Command</label>
+                          <input type="text" id="Startupcommandfield" name="Startupcommandfield" class=" form-control" placeholder="Optional startup command for the container" dockerparamkey="-c">
+                      </div>
+                      <div class="col-lg-6 col-md-6 dockerModal">
+                          <label for="category">Additional Startup</label>
+                          <input type="text" id="additionalStartupcommandfield" name="additionalStartupcommandfield" class=" form-control" placeholder="Additional startup command for the container" dockerparamkey="-exec">
+                      </div>
+                  </div>
+              </form>
+          </section>
+      </div>
+      <div class="modal-footer">
+          <button type="button" class="btn btn-default btn-primary" onclick="if(generateDockerLaunchParams()!=''){$('#myModalLabelDockerContainer').modal('hide');}else{return(false);}"><i class="fa fa-save fa-1x"></i>&nbsp;Add</button>
+          <button type="button" class="btn btn-default btn-primary" data-dismiss="modal">
+          <i class="fa fa-undo fa-1x"></i>&nbsp;Cancel</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div aria-hidden="true" aria-labelledby="myModalLabel" role="dialog" tabindex="-1" id="editAttributesModalContainer" class="modal fade" data-backdrop="static">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button aria-hidden="true" data-dismiss="modal" class="close" type="button">
+                    x
+                </button>
+                <h4 class="modal-title">
+                <i class="fa fa-eraser txt-color-blue"></i>&nbsp;&nbsp;Edit Attributes
+                </h4>
+            </div>
+            <div class="modal-body no-padding">
+                <div class="loadingContainer">
+                    <img class="center-block loadingContainerimageCSS" src="img/loading.gif" />
+                </div>
+                <div class="errorMsgContainer loadingerrorMsgContainerCSS"></div>
+                <form class="attributesEditFormArea padding10" action="">
+                    <table id="attributesEditListArea" class="table table-striped table-bordered table-hover dataTable no-footer table-condensed tablesorter" cellpadding="5px" width="100%">
+                        <thead>
+                            <tr>
+                                <th>Attributes</th>
+                                <th>Values</th>
+                            </tr>
+                        </thead>
+                        <tbody class="attributesEditTableBody">
+                        </tbody>
+                    </table>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <a class="btn btn-default" data-dismiss="modal">Close</a>
+                <a type="submit" class="btn btn-primary saveAttribBtn">Save</a>
+            </div>
+        </div>
+        <!-- /.modal-content -->
+    </div>
+    <!-- /.modal-dialog -->
+</div>
+
+
+
+    
+<script src="js/libs/jquery-2.0.2.min.js"></script>
+<!--Authentication Setup through token-->
+<script src="authSetup.js"></script>
+<script src="js/libs/jquery-ui-1.10.3.min.js"></script>
+<script src="js/libs/modernizr-2.5.3.min.js"></script>
+<script src="js/select2.min.js"></script>
+<script src="js/bootstrap-treeview.js"></script>
+
+<script src="js/bootstrap/bootstrap.min.js"></script>
+<!-- CUSTOM NOTIFICATION -->
+<script src="js/notification/SmartNotification.min.js"></script>
+<!-- JARVIS WIDGETS -->
+<script src="js/smartwidgets/jarvis.widget.min.js"></script>
+<script src="js/plugin/bootstrap-wizard/jquery.bootstrap.wizard.js"></script>
+<script src="js/plugin/bootbox/bootbox.min.js"></script>
+
+<script src="/private/js/jquery.dataTables.min.js"></script>
+<script src="js/jquery.tablesorter.min.js"></script>
+<script src="js/jquery.validate.min.js"></script>
+<script src="js/additional-methods.min.js"></script>
+<script src="/socket.io/socket.io.js"></script>
+<script src="js/app.js"></script>
+
+<script src="js/dev/dev.js"></script>
+<script src="js/toastr.min.js"></script>
+    
+<!-- MAIN APP JS FILE -->
+<script type="text/javascript">
+  //toastr config
+  toastr.options.closeButton = true;
+  toastr.options.closeDuration = 2000;
+var a, b, x;
+String.prototype.capitalizeFirstLetter = function() {
+    return this.charAt(0).toUpperCase() + this.slice(1);
+}
+
+
+$(document).ready(function() {
+    var hasSettingsPermission = false;
+    if (haspermission("settings", "read")) {
+        hasSettingsPermission = true;
+    }
+    if (!hasSettingsPermission) {
+        $('#settingsNew').addClass('hidden');
+        $('#noenvwarning').addClass('hidden');
+        $('#noEnvError').removeClass('hidden');
+    }
+
+    var hasDesignPermission = false;
+    if (haspermission("design", "read")) {
+        hasDesignPermission = true;
+    }
+
+    if (!hasDesignPermission) {
+        $('#designNew').addClass('hidden');
+        $('#noenvwarning').addClass('hidden');
+        $('#noEnvError').removeClass('hidden');
+    }
+});
+
+
+function foldTreeForSetting() {
+    var list = $('#setting_tree').find('.fa-angle-down'),
+        len = list.length;
+    for (var i = 0; i < len; i++) {
+        list.eq(i).trigger('click');
+    }
+}
+/*Added for angular integration. To disable, turn off flag and remove authSetup.js*/
+var isAngularIntegration = true;
+function locationClick(){
+  if(isAngularIntegration){
+    window.location.href = "../../cat3/#/dashboard/workzone";
+  }
+}
+
+
+function setleftnavigation(toplink, breadcrumbHeader) {
+    var TabID = $(toplink).attr('id');
+    if (TabID === "workZoneNew") {
+        
+        if(isAngularIntegration){
+          var checkUrl = window.location.href;
+          if(checkUrl.indexOf('ajax/Dev.html') !==-1){
+            console.log('here');
+          }else{
+            locationClick();  
+            return false;
+          }
+        }
+        loadTreeFuncNew();
+        $('#Settings_nav').hide();
+        $('#Workspace1').show();
+        $('#trackShow').hide();
+
+    } else if (TabID === "designNew") {
+        $('#selectOrgName').trigger('click');
+        $('#Workspace1').hide();
+        $('#Settings_nav').hide();
+        $('#trackShow').hide();
+
+    } else if (TabID === "settingsNew") {
+        $('#tree').empty()
+        $('#trackTree').empty();
+        loadSettingsTree();
+        foldTreeForSetting();
+        $('#Workspace1').hide();
+        $('#trackShow').hide();
+        $('#Settings_nav').show();
+
+    } else if (TabID === "settingsNewClick") {
+        $('#tree').empty();
+        $('#trackTree').empty();
+        loadSettingsTree();
+        foldTreeForSetting();
+        $('#Workspace1').hide();
+        $('#trackShow').hide();
+        $('#Settings_nav').show();
+
+    } else if (TabID === "trackNew") {
+        $('#tree').empty();
+        $('#trackTree').empty();
+        getTrackTreeDetails();
+        loadTrackTree();
+        $('#Workspace1').hide();
+        $('#Settings_nav').hide();
+        $('#trackShow').show();
+    }
+
+    if ($(toplink).hasClass('active')) {
+      if ($(toplink).attr('id') == 'workZoneNew') {
+          selectEnv();
+      }
+      return;
+    }
+    $('.navigationTab').removeClass('active').find("i").removeClass('txt-color-blue');
+    $(toplink).addClass('active').find('i').addClass('txt-color-blue');
+    $('nav > ul').addClass('hidden'); //hiding all navigation elements
+    var navbar = $(toplink).closest("li").attr('navigation');
+    $('#Workspace1').addClass('hidden');
+    if (navbar.length) {
+        var navs = navbar.split(',');
+        for (var i = 0; i < navs.length; i++) {
+            $('#' + navs[i]).removeClass('hidden').css('display', '');
+        }
+
+    }
+    if (breadcrumbHeader == 'org') {
+        window.selectedOrgName = $('.orgSelected').find('span').text();
+    } else {
+        //Reverting the warning message when no org present
+        $('#content').removeClass('hidden').removeAttr('style', 'height:100% !important');
+        $('#noenvwarning').addClass('hidden');
+        $('#noEnvError').addClass('hidden');
+        $('ol.breadcrumb').removeClass('hidden');
+        window.selectedOrgName = breadcrumbHeader;
+    }
+    //Setting local storage with last selected tab
+    localStorage.setItem("lasttabselected", $(toplink).attr('id'));
+    if ($(toplink).attr('id') == 'workZoneNew') {
+      selectEnv();
+    }
+}
+
+//Expanding the providers tree
+var serviceURL = "../d4dMasters/";
+window.selectedOrgName = $('.orgSelected').text().trim();
+var SettingTreeJson = [{
+        "name": "organizationsetup",
+        "text": "Organization Setup",
+        "icon": "fa fa-lg fa-fw fa-building",
+        "nodetype": "org",
+        "nodes": [{
+            "name": "organizations",
+            "text": "Organizations",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/OrgList.html",
+            "parent": "org",
+            "nodetype": "OrgList",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-building"
+
+        }, {
+            "name": "organizations",
+            "text": "Business Groups",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/ProductGroupList.html",
+            "parent": "org",
+            "nodetype": "ProductGroupList",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-th"
+
+        }, {
+            "name": "organizations",
+            "text": "Projects",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/ProjectList.html",
+            "parent": "org",
+            "nodetype": "ProjectList",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-tags"
+
+        },{
+            "name": "organizations",
+            "text": "Environments",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/EnvironmentConceptList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-tint",
+            "parent": "devops",
+            "nodetype": "EnvironmentConceptList"
+        }],
+        "borderColor": "#000",
+        "selectable": false,
+        "href": "javascript:void(0);"
+
+
+    }, {
+        "name": "config setup",
+        "text": "Config Setup",
+        "nodes": [{
+            "name": "organizations",
+            "text": "Chef Server",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/ConfigManagementList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-random"
+        }, {
+            "name": "organizations",
+            "text": "Puppet Server",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/PuppetServerList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-random"
+
+        }],
+        "borderColor": "#000",
+        "selectable": false,
+        "href": "javascript:void(0);",
+        "icon": "fa-lg fa-fw fa fa-tachometer"
+    },  {
+        "name": "devopssetup",
+        "text": "DevOps Setup",
+        "icon": "fa fa-lg fa-fw fa-qrcode",
+        "nodetype": "devops",
+        "nodes": [{
+                "name": "organizations",
+                "text": "Nexus Server",
+                "borderColor": "#000",
+                "href": "#ajax/Settings/NexusServerList.html",
+                "selectable": true,
+                "icon": "fa fa-lg fa-fw fa-random"
+
+            }, {
+                "name": "organizations",
+                "text": "Docker",
+                "borderColor": "#000",
+                "href": "#ajax/Settings/DockerTemplatesList.html",
+                "selectable": true,
+                "icon": "fa fa-lg fa-fw fa-hdd-o"
+
+            }, {
+                "name": "organizations",
+                "text": "Jenkins",
+                "borderColor": "#000",
+                "href": "#ajax/Settings/JenkinsConfigList.html",
+                "selectable": true,
+                "icon": "fa fa-lg fa-fw fa-link"
+
+            }, {
+                "name": "organizations",
+                "text": "Providers",
+                "borderColor": "#000",
+                "href": "#ajax/Settings/ProvidersList.html",
+                "selectable": true,
+                "icon": "fa fa-lg fa-fw fa-sitemap"
+            }, {
+                "name": "organizations",
+                "text": "CMDB",
+                "borderColor": "#000",
+                "href": "#ajax/Settings/cmdbList.html",
+                "selectable": true,
+                "icon": "fa fa-lg fa-fw fa-database"
+            },
+
+        ],
+        "borderColor": "#000",
+        "selectable": false,
+        "href": "javascript:void(0);"
+
+    }, {
+        "name": "usersetup",
+        "text": "Users Setup",
+        "icon": "fa fa-lg fa-fw  fa-tasks",
+        "nodes": [{
+            "name": "organizations",
+            "text": "User Roles",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/RolesList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-th-list"
+
+        }, {
+            "name": "organizations",
+            "text": "Users",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/UsersList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-user"
+
+        }, {
+            "name": "organizations",
+            "text": "Teams",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/TeamsList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-users"
+
+        }],
+        "borderColor": "#000",
+        "selectable": false,
+        "href": "javascript:void(0);"
+
+    }, {
+        "name": "gallerysetup",
+        "text": "Gallery Setup",
+        "icon": "fa fa-lg fa-fw fa-building",
+        "nodes": [{
+            "name": "templates",
+            "text": "Template Types",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/DesignTemplateTypesList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-files-o"
+
+        }, {
+            "name": "organizations",
+            "text": "Templates",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/TemplatesList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-files-o"
+
+        }, {
+            "name": "organizations",
+            "text": "Service Command",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/ServiceCommandList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-terminal"
+
+        }, {
+            "name": "organizations",
+            "text": "VMImage",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/ImagesList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-image"
+
+        }, {
+            "name": "organizations",
+            "text": "Script Gallery",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/scriptList.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa fa-folder-o"
+
+        }],
+        "borderColor": "#000",
+        "selectable": false,
+        "href": "javascript:void(0);"
+
+    }, {
+        "name": "track",
+        "text": "Track Setup",
+        "nodes": [{
+            "name": "templates",
+            "text": "Dashboards",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/DashboardSettings.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-files-o"
+        }],
+        "borderColor": "#000",
+        "selectable": false,
+        "href": "javascript:void(0);",
+        "icon": "fa-lg fa-fw fa fa-tachometer"
+    }, {
+        "name": "userguide",
+        "text": "User Information",
+        "borderColor": "#000",
+        "nodes": [{
+            "name": "Guide",
+            "text": "User Guide",
+            "borderColor": "#000",
+            "href": "ajax/Settings/Catalyst-Guide.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-file-pdf-o",
+            "target": "_blank",
+        }, {
+            "name": "Guide",
+            "text": "Videos",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/videos.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa-file-video-o",
+        }],
+        "selectable": false,
+        "href": "javascript:void(0);",
+        "icon": "fa-lg fa-fw fa fa-book"
+    }
+
+];
+
+function loadSettingsTree() {
+    $('#setting_tree').empty().treeview({
+        data: SettingTreeJson,
+        enableLinks: true,
+        collapseIcon: 'fa fa-angle-down',
+        expandIcon: 'fa fa-angle-right',
+        levels: -1,
+        onNodeSelected: function(event, node) {
+            drawBreadCrumb1();
+            event.stopPropagation();
+        }
+    });
+
+}
+var trackTree;
+
+function getTrackTreeDetails() {
+    $.ajax({
+        type: "get",
+        dataType: "json",
+        async: false,
+        url: '../track',
+        success: function(data) {
+            trackTree = [];
+
+            for (var i = 0; i < data.length; i++) {
+                trackTree.push({
+                    "name": "data",
+                    "text": data[i].type,
+                    "icon": "icon fa fa-line-chart",
+                    "nodetype": "data",
+                    "nodes": [],
+                    "borderColor": "#000",
+                    "selectable": false,
+                    "href": "javascript:void(0);"
+                });
+                for (var j = 0; j < data[i].itemUrls.length; j++) {
+                    if (data[i].itemUrls[j].childItem.length > 0) {
+                        trackTree[i].nodes.push({
+                            "name": "parentData",
+                            "text": data[i].itemUrls[j].name,
+                            "borderColor": "#000",
+                            "href": 'javascript:void(0)',
+                            "parent": "data",
+                            "data-href": data[i].itemUrls[j].url,
+                            "nodetype": "parentNode",
+                            "selectable": false,
+                            "icon": "icon fa fa-lg fa-fw fa-files-o",
+                            "nodes": []
+                        });
+                    } else {
+                        trackTree[i].nodes.push({
+                            "name": "parentData",
+                            "text": data[i].itemUrls[j].name,
+                            "borderColor": "#000",
+                            "href": 'javascript:void(0)',
+                            "parent": "data",
+                            "data-href": data[i].itemUrls[j].url,
+                            "nodetype": "parentNode",
+                            "selectable": true,
+                            "icon": "icon fa fa-lg fa-fw fa-files-o"
+                        });
+                    }
+                    for (var k = 0; k < data[i].itemUrls[j].childItem.length; k++) {
+                        trackTree[i].nodes[j].nodes.push({
+                            "name": "childData",
+                            "text": data[i].itemUrls[j].childItem[k].name,
+                            "borderColor": "#000",
+                            "href": 'javascript:void(0)',
+                            "parent": "data",
+                            "data-href": data[i].itemUrls[j].childItem[k].url,
+                            "nodetype": "childType",
+                            "selectable": true,
+                            "icon": "fa fa-fw fa-1x fa-desktop"
+                        });
+                    }
+                }
+            }
+        }
+    })
+}
+
+function loadTrackTree() {
+    $('#trackTree').treeview({
+        data: trackTree,
+        enableLinks: true,
+        collapseIcon: 'fa fa-angle-down',
+        expandIcon: 'fa fa-angle-right',
+        levels: -1,
+        onNodeSelected: function(event, node) {
+            $("#content").empty();
+            $("#content").attr('style', 'height: 100%!important').append('<iframe src=' + node['data-href'] + ' style="width: 101% ! important; height: 97%! important; border: medium none;"></iframe>');
+            event.stopPropagation();
+            event.preventDefault();
+            event.stopPropagation();
+            return false;
+        }
+    });
+}
+
+var treeData;
+
+function getTreeData() {
+    $.ajax({
+        type: "get",
+        dataType: "json",
+        async: false,
+        url: "../organizations/getTreeForbtv",
+        success: function(data1) {
+            treeData = data1;
+        }
+    });
+
+}
+
+function buildTree() {
+    $('#tree').empty().treeview({
+        data: treeData,
+        enableLinks: true,
+        collapseIcon: 'fa fa-angle-down',
+        expandIcon: 'fa fa-angle-right',
+        levels: 1,
+        onNodeSelected: function(event, node) {
+
+            window.selectedOrgName = $('li[data-nodeid="' + node.nodeId + '"]').first().find('a').first().attr('orgname');
+            localStorage.setItem('selectedOrgName', $('li[data-nodeid="' + node.nodeId + '"]').first().find('a').first().attr('orgname'));
+            localStorage.setItem('selectedOrgId', $('li[data-nodeid="' + node.nodeId + '"]').first().find('a').first().attr('orgid'));
+            /*Description from the node*/
+            localStorage.setItem("orgname", node.orgname);
+            localStorage.setItem("projname", node.projname ? node.projname : node.text);
+            localStorage.setItem("bgname", node.bgname);
+            localStorage.setItem("envname", node.text);
+            localStorage.setItem('itProjectActive', 'no');
+
+            /*Draw the breadcrumb from ol*/
+            var ol = $("#ribbon ol.breadcrumb");
+            if (ol.children().length == 0) {
+                drawBreadCrumb();
+            }
+            if (node.hasOwnProperty('itemtype') && node.itemtype === "proj") {
+                localStorage.setItem('itProjectActive', 'yes');
+            }
+
+        }
+    });
+}
+
+var loadTreeFuncNew = function(lazy) {
+    if (lazy) {
+        buildTree();
+    } else {
+        getTreeData();
+        buildTree();
+    }
+
+}
+
+
+
+function getUrlParameter(sParam) {
+    var u = $('#workZoneNew').attr('href').split('?');
+    var sPageURL = u[1];
+    if (typeof sPageURL != 'undefined') {
+        var sURLVariables = sPageURL.split('&');
+        for (var i = 0; i < sURLVariables.length; i++) {
+            var sParameterName = sURLVariables[i].split('=');
+            if (sParameterName[0] == sParam) {
+                return sParameterName[1];
+            }
+        }
+    } else {
+        //check local storage for last env clicked.
+        var lastwzurl = localStorage.getItem("lastworkzoneurl");
+        if (lastwzurl) {
+            u = lastwzurl.split('?');
+            sPageURL = u[1];
+            if (typeof sPageURL != 'undefined') {
+                var sURLVariables = sPageURL.split('&');
+                for (var i = 0; i < sURLVariables.length; i++) {
+                    var sParameterName = sURLVariables[i].split('=');
+                    if (sParameterName[0] == sParam) {
+                        return sParameterName[1];
+                    }
+                }
+            } else
+                return ('');
+
+        } else
+            return ('');
+    }
+    return ('');
+}
+
+$(document).keypress("l", function(e) {
+    if (e.ctrlKey && e.altKey && (String.fromCharCode(e.which) === 'l' || String.fromCharCode(e.which) === 'L')) {
+        window.open('/private/catlog.html', 'Catalyst Log');
+    }
+});
+
+
+
+window.getUrlParams = function(url) {
+    var urlParams = {};
+    var indexOfQues = url.lastIndexOf("?");
+    if (indexOfQues != -1) {
+        var sub = url.substring(indexOfQues + 1);
+        console.log(sub);
+        var params = sub.split('&')
+        for (var i = 0; i < params.length; i++) {
+            var paramParts = params[i].split('=');
+            urlParams[paramParts[0]] = paramParts[1];
+        }
+    }
+    return urlParams;
+
+};
+
+function selectFirstEnvironment() {
+    var $workspaceTree = $('#Workspace1');
+    var $orgLink = $workspaceTree.find('a[itemtype="org"][bgId][projId][envId]');
+    if ($orgLink.length) {
+        $orgLink = $orgLink.first().click();
+        var $bgLink = $workspaceTree.find('a[rowid="' + $orgLink.attr('bgId') + '"]').click();
+        var $projLink = $workspaceTree.find('a[rowid="' + $orgLink.attr('projId') + '"]').click();
+        var $envLink = $workspaceTree.find('a[rowid="' + $orgLink.attr('envId') + '"]');
+        $('#workZoneNew').attr('href', $envLink.attr('href'));
+        $envLink.click();
+        return true;
+    } else {
+        $('#workZoneNew').attr('href', '#');
+        return false;
+    }
+}
+
+function selectEnv() {
+    var $workspaceTree = $('#Workspace1');
+    var url = localStorage.getItem("lastworkzoneurl");
+    if (!url) {
+        url = window.location.href;
+    }
+    var urlParams = getUrlParams(url);
+    console.log(urlParams);
+    var $orgLink;
+
+    var envFound = false;
+    if (urlParams.envid && urlParams.org && urlParams.bg && urlParams.projid) { //finding env
+        var treeNodes = [];
+
+        $orgLink = $workspaceTree.find('a[itemtype="org"][rowid="' + urlParams.org + '"]');
+        if ($orgLink.length) {
+            $orgLink.click();
+            treeNodes.push($orgLink);
+
+        }
+        var $bgLink = $workspaceTree.find('a[rowid="' + urlParams.bg + '"]');
+        if ($bgLink.length) {
+            $bgLink.click();
+            treeNodes.push($bgLink);
+        }
+        var $projLink = $workspaceTree.find('a[rowid="' + urlParams.projid + '"]');
+        if ($projLink.length) {
+            $projLink.click();
+            treeNodes.push($projLink);
+        }
+        var $envLink = $workspaceTree.find('a[rowid="' + urlParams.envid + '"]');
+        if ($envLink.length) {
+            //$envLink = $envLink.first().click();
+            console.log('ancor a ==>', $envLink.attr('href'));
+            $('#workZoneNew').attr('href', $envLink.attr('href'));
+            treeNodes.push($envLink);
+            envFound = true;
+        }
+        if (!envFound) {
+            console.log('treenodes', treeNodes);
+            for (var i = treeNodes.length - 1; i >= 0; i--) {
+                treeNodes[i].click();
+            }
+            loadTreeFuncNew(true);
+            envFound = selectFirstEnvironment();
+        }
+
+
+    } else {
+        //not found ... trying to find first element in any org
+        envFound = selectFirstEnvironment();
+    }
+    if (!envFound) {
+        $('#content').addClass('hidden');
+        $('#noenvwarning').removeClass('hidden');
+        $('ol.breadcrumb').addClass('hidden');
+    } else {
+        $('#content').removeClass('hidden').removeAttr('style', 'height:100% !important');
+    }
+}
+
+//Renavigate to the tab that was previously selected.
+checkandnavigatetotab = function() {
+    //has tab in LS
+    var ltab = localStorage.getItem("lasttabselected");
+    if (ltab) {
+        $('#' + ltab).trigger('click');
+        drawBreadCrumb();
+    } else { //will be a first time load
+        console.log('selecting first env');
+        $('#workZoneNew').trigger('click');
+    }
+};
+//Commented for angular integration
+if (isAngularIntegration) {
+//Angular Change - condition added for manual refresh error when the user is in some settings page and refreshes it.
+  var tabSelected;
+  var url = window.location.href;
+  if (tabSelected = $('#settingsNew').attr('id')) {
+    if (url.indexOf('#ajax/Settings/') !== -1) {
+        window.location = '#ajax/Settings/Dashboard.html';
+    }
+  }
+  if(tabSelected = $('#designNew').attr('id')) {
+    if (url.indexOf('#ajax/DesignBlueprintAzure.html') !== -1 || url.indexOf('#ajax/DesignBlueprint.html')!== -1 || url.indexOf('#ajax/DesignBlueprintVmware.html') !== -1) {
+        window.location = '#ajax/Aws-Production.html';
+    } 
+  }
+} else{
+  checkandnavigatetotab();
+}
+loadSettingsTree();
+foldTreeForSetting();
+
+//check this functionality as it breaks at times..
+function saveAtrributesHandler(e) {
+    var $modal = $('#editAttributesModalContainer');
+    var $tbody = $modal.find('.attributesEditTableBody');
+    var $input = $tbody.find('.attribValueInput');
+    var attributes = [];
+    for (var j = 0; j < $input.length; j++) {
+        var $this = $($input[j]);
+        var attributeKey = $this.attr('data-attribKey');
+        var attribValue = $this.val();
+        if (attribValue) {
+            var attribPathParts = attributeKey.split('/');
+            var attributeObj = {};
+            var currentObj = attributeObj;
+            for (var i = 0; i < attribPathParts.length; i++) {
+                if (!currentObj[attribPathParts[i]]) {
+                    if (i === attribPathParts.length - 1) {
+                        currentObj[attribPathParts[i]] = attribValue;
+                        continue;
+                    } else {
+                        currentObj[attribPathParts[i]] = {};
+                    }
+                }
+                currentObj = currentObj[attribPathParts[i]];
+            }
+            attributes.push({
+                name: $this.attr('data-attribName'),
+                jsonObj: attributeObj
+            });
+        } else {
+            if ($this.attr('data-attributeRequired') === 'true') {
+                toastr.warning("Please fill in the required attributes");
+                return false;
+            }
+        }
+    }
+    createAttribTableRowFromJson(attributes);
+    $modal.modal('hide');
+}
+</script>
+<script src="js/blueprintLaunch.js"></script>
+<script src="js/blueprintCommon.js"></script>
+<script src="js/chefmodalcommon.js"></script>
+<script src="js/jquerytemplatemin.js"></script>
+<script src="/private/js/settingscommon.js"></script>
+<script src="/private/js/selectorCompnetBlueprint.js" type="application/javascript"></script>
+</body>
+</html>
diff --git a/server/app/lib/utils/masterUtil.js b/server/app/lib/utils/masterUtil.js
index 0b4afa428..793b1fb0c 100755
--- a/server/app/lib/utils/masterUtil.js
+++ b/server/app/lib/utils/masterUtil.js
@@ -514,6 +514,143 @@ var MasterUtil = function() {
         });
     }
 
+    // Return all Bitbucket
+    this.getBitbucket = function(orgList, callback) {
+        var bitbucketList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelBitbucketConfig.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, bitbucket) {
+            if (bitbucket) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < bitbucket.length; i++) {
+                        if (bitbucket[i].id === '27') {
+                            names = configmgmtDao.convertRowIDToValue(bitbucket[i].orgname_rowid, rowidlist)
+                            bitbucket[i].orgname = names;
+                            bitbucketList.push(bitbucket[i]);
+                        }
+                    }
+                    callback(null, bitbucketList);
+                    return;
+                });
+            } else {
+                callback(err, null);
+                return;
+            }
+
+        });
+    }
+
+    this.getOctopus = function(orgList, callback) {
+        var octopusList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelOctopusConfig.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, octopus) {
+            if (octopus) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < octopus.length; i++) {
+                        if (octopus[i].id === '28') {
+                            names = configmgmtDao.convertRowIDToValue(octopus[i].orgname_rowid, rowidlist)
+                            octopus[i].orgname = names;
+                            octopusList.push(octopus[i]);
+                        }
+                    }
+                    callback(null, octopusList);
+                    return;
+                });
+            } else {
+                callback(err, null);
+                return;
+            }
+
+        });
+    }
+
+    this.getFunctionalTest = function(orgList, callback) {
+        var functionaltestList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelFunctionalTestConfig.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, functionaltest) {
+            if (functionaltest) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < functionaltest.length; i++) {
+                        if (functionaltest[i].id === '29') {
+                            names = configmgmtDao.convertRowIDToValue(functionaltest[i].orgname_rowid, rowidlist)
+                            functionaltest[i].orgname = names;
+                            functionaltestList.push(functionaltest[i]);
+                        }
+                    }
+                    callback(null, functionaltestList);
+                    return;
+                });
+            } else {
+                callback(err, null);
+                return;
+            }
+
+        });
+    }
+    
+
+
+    this.getJira = function(orgList, callback) {
+        var jiraList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelMastersJira.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, jira) {
+            if (jira) {
+                
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < jira.length; i++) {
+                        logger.debug(jira[i].id);
+                        if (jira[i].id === '23') {
+
+                            names = configmgmtDao.convertRowIDToValue(jira[i].orgname_rowid, rowidlist)
+                            jira[i].orgname = names;
+                            jiraList.push(jira[i]);
+                        }
+                    }
+                    callback(null, jiraList);
+                    return;
+                });
+            } else {
+                callback(err, null);
+                return;
+            }
+
+        });
+    }
+
+
+
+
     // Return All Orgs specific to User
     this.getActiveOrgs = function(loggedInUser, callback) {
         var orgList = [];
diff --git a/server/app/lib/utils/masterUtil.js.bak b/server/app/lib/utils/masterUtil.js.bak
new file mode 100644
index 000000000..0b4afa428
--- /dev/null
+++ b/server/app/lib/utils/masterUtil.js.bak
@@ -0,0 +1,2227 @@
+/*
+ Copyright [2016] [Relevance Lab]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+
+
+// This file act as a Util class which contains Settings related all business logics.
+
+var logger = require('_pr/logger')(module);
+var d4dModelNew = require('../../model/d4dmasters/d4dmastersmodelnew.js');
+var ObjectId = require('mongoose').Types.ObjectId;
+var permissionsetDao = require('../../model/dao/permissionsetsdao');
+var d4dModel = require('../../model/d4dmasters/d4dmastersmodel.js');
+var configmgmtDao = require('../../model/d4dmasters/configmgmt.js');
+var appConfig = require('_pr/config');
+var chefSettings = appConfig.chef;
+var AppDeploy = require('_pr/model/app-deploy/app-deploy');
+var async = require('async');
+
+var MasterUtil = function() {
+    // Return All Orgs specific to User
+    this.getOrgs = function(loggedInUser, callback) {
+        var orgList = [];
+        d4dModelNew.d4dModelMastersUsers.find({
+            loginname: loggedInUser
+        }, function(err, users) {
+            if (err) {
+                logger.debug("Unable to fetch User.");
+                callback(err, null);
+            }
+            logger.debug("Able to get User: ", JSON.stringify(users));
+            if (users) {
+                var count = 0;
+                var usrCount = 0;
+                var errOccured = false;
+                for (var x = 0; x < users.length; x++) {
+                    (function(countUser) {
+                        if (users[countUser].id === '7') {
+                            usrCount++;
+                            var orgIds = users[countUser].orgname_rowid;
+                            logger.debug("orgIds: ", typeof orgIds[0]);
+                            if (typeof orgIds[0] === 'undefined') {
+                                d4dModelNew.d4dModelMastersOrg.find({
+                                    id: "1",
+                                    active: true
+                                }, function(err, orgs) {
+                                    count++;
+                                    if (err) {
+                                        logger.debug("Unable to fetch Org.", err);
+                                        errOccured = true;
+                                        return;
+                                    }
+                                    if (orgs) {
+                                        for (var y = 0; y < orgs.length; y++) {
+                                            (function(countOrg) {
+                                                if (orgs[countOrg].id === '1') {
+                                                    logger.debug("Able to get Org.", JSON.stringify(orgs[countOrg]));
+                                                    orgList.push(orgs[countOrg]);
+                                                }
+                                            })(y);
+                                        }
+
+                                    }
+                                    if (count === usrCount) {
+                                        logger.debug("Returned Orgs: ", JSON.stringify(orgList));
+                                        callback(errOccured, orgList);
+                                    }
+
+
+                                });
+                            } else {
+
+                                logger.debug("Org orgIds for query: ", orgIds);
+                                d4dModelNew.d4dModelMastersOrg.find({
+                                    rowid: {
+                                        $in: orgIds
+                                    },
+                                    active: true
+                                }, function(err, orgs) {
+                                    count++;
+                                    if (err) {
+                                        logger.debug("Unable to fetch Org.", err);
+                                        errOccured = true;
+                                        return;
+                                    }
+                                    if (orgs) {
+                                        for (var y = 0; y < orgs.length; y++) {
+                                            (function(countOrg) {
+                                                if (orgs[countOrg].id === '1') {
+                                                    logger.debug("Able to get Org.", JSON.stringify(orgs[countOrg]));
+                                                    orgList.push(orgs[countOrg]);
+                                                }
+                                            })(y);
+                                        }
+                                    }
+                                    logger.debug('count ==>', count, "user length = >", usrCount);
+                                    if (count === usrCount) {
+                                        logger.debug("Returned Orgs: ", JSON.stringify(orgList));
+                                        callback(errOccured, orgList);
+                                    }
+                                });
+                            }
+                        }
+                    })(x);
+                }
+            } else {
+                callback(null, orgList);
+            }
+        });
+    }
+
+    // Return all BusinessGroups specific to User
+    this.getBusinessGroups = function(orgList, callback) {
+
+        var productGroupList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelMastersProductGroup.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, bgs) {
+            if (err) {
+                callback(err, null);
+            }
+            if (bgs) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < bgs.length; i++) {
+                        (function(bgCount) {
+                            if (bgs[bgCount].id === '2') {
+                                logger.debug("Returned BG: ", JSON.stringify(bgs[bgCount]));
+                                names = configmgmtDao.convertRowIDToValue(bgs[bgCount].orgname_rowid, rowidlist)
+                                bgs[bgCount].orgname = names;
+                                productGroupList.push(bgs[bgCount]);
+                            }
+                        })(i);
+                    }
+                    logger.debug("productGroupList: ", JSON.stringify(productGroupList));
+                    callback(null, productGroupList);
+                    return;
+                });
+            } else {
+                callback(null, productGroupList);
+                return;
+            }
+        });
+    }
+
+    this.getBusinessGroupsByOrgId = function(orgId, callback) {
+        d4dModelNew.d4dModelMastersProductGroup.find({
+            orgname_rowid: orgId,
+            id:'2'
+        }, function(err, productGroupData) {
+            if(err) {
+                logger.debug("getBusinessGroupsByOrgId: "+err);
+                callback(err, null);
+            }
+            callback(null, productGroupData);
+
+        });
+    };
+
+    this.getProjectsBybgId = function(bgId, callback) {
+        d4dModelNew.d4dModelMastersProjects.find({
+            productgroupname_rowid: bgId,
+            id:'4'
+        }, function(err, projectData) {
+            if(err) {
+                logger.debug("getProjectsBybgId: "+err);
+                callback(err, null);
+            }
+            callback(null, projectData);
+
+        });
+    };
+
+    this.getEnvironmentsByprojectId = function(projectId, callback) {
+        d4dModelNew.d4dModelMastersEnvironments.find({
+            projectname_rowid: {$regex: projectId},
+            id:'3'
+        }, function(err, environmentData) {
+            if(err) {
+                logger.debug("getEnvironmentsByprojectId: "+err);
+                callback(err, null);
+            }
+            callback(null, environmentData);
+
+        });
+    };
+
+    // Return all Environments specific to User
+    this.getEnvironments = function(orgList, callback) {
+        var envList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelMastersEnvironments.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, envs) {
+            if (err) {
+                callback(err, null);
+            }
+            if (envs) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < envs.length; i++) {
+                        (function(envCount) {
+                            if (envs[envCount].id === '3') {
+                                names = configmgmtDao.convertRowIDToValue(envs[envCount].orgname_rowid, rowidlist)
+                                envs[envCount].orgname = names;
+                                names = configmgmtDao.convertRowIDToValue(envs[envCount].configname_rowid, rowidlist)
+                                envs[envCount].configname = names;
+                                envList.push(envs[envCount]);
+                            }
+                        })(i);
+                    }
+                    logger.debug("Returned ENVs: ", JSON.stringify(envList));
+                    callback(null, envList);
+                    return;
+                });
+            } else {
+                callback(null, envList);
+                return;
+            }
+        });
+    }
+
+    // Return all Projects specific to User
+    this.getProjects = function(orgList, callback) {
+        var projectList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelMastersProjects.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, projects) {
+            if (err) {
+                callback(err, null);
+            }
+            if (projects) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    var allEnvs = '';
+                    for (var i = 0; i < projects.length; i++) {
+                        (function(projectCount) {
+                            if (projects[projectCount].id === '4') {
+                                names = configmgmtDao.convertRowIDToValue(projects[projectCount].orgname_rowid, rowidlist);
+                                bgnames = configmgmtDao.convertRowIDToValue(projects[projectCount].productgroupname_rowid, rowidlist);
+                                projects[projectCount].orgname = names;
+                                projects[projectCount].productgroupname = bgnames;
+                                projectList.push(projects[projectCount]);
+                            }
+                        })(i);
+                    }
+                    logger.debug("Returned Projects: ", JSON.stringify(projectList));
+                    callback(null, projectList);
+                    return;
+                });
+            } else {
+                callback(null, projectList);
+                return;
+            }
+        });
+    }
+    this.getBusinessGroupsByOrgId = function(orgId, callback) {
+        d4dModelNew.d4dModelMastersProductGroup.find({
+            orgname_rowid: orgId,
+            id:'2'
+        }, function(err, productGroupData) {
+            if(err) {
+                logger.debug("getBusinessGroupsByOrgId: "+err);
+                callback(err, null);
+            }
+            callback(null, productGroupData);
+
+        });
+    };
+
+    this.getProjectsBybgId = function(bgId, callback) {
+        d4dModelNew.d4dModelMastersProjects.find({
+            productgroupname_rowid: bgId,
+            id:'4'
+        }, function(err, projectData) {
+            if(err) {
+                logger.debug("getProjectsBybgId: "+err);
+                callback(err, null);
+            }
+            callback(null, projectData);
+
+        });
+    };
+
+    // Return all ConfigManagement specific to User
+    this.getCongifMgmts = function(orgList, callback) {
+        var congifMgmtList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelMastersConfigManagement.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, configMgmt) {
+            if (configMgmt) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < configMgmt.length; i++) {
+                        if (configMgmt[i].id === '10') {
+                            names = configmgmtDao.convertRowIDToValue(configMgmt[i].orgname_rowid, rowidlist)
+                            configMgmt[i].orgname = names;
+                            congifMgmtList.push(configMgmt[i]);
+                        }
+                    }
+                    callback(null, congifMgmtList);
+                    return;
+                });
+            } else {
+                callback(err, null);
+                return;
+            }
+        });
+    }
+    // Return all Dockers
+    this.getDockers = function(orgList, callback) {
+        var dockerList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelMastersDockerConfig.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, dockers) {
+            if (dockers) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < dockers.length; i++) {
+                        if (dockers[i].id === '18') {
+                            names = configmgmtDao.convertRowIDToValue(dockers[i].orgname_rowid, rowidlist)
+                            dockers[i].orgname = names;
+                            dockerList.push(dockers[i]);
+                        }
+                    }
+                    callback(null, dockerList);
+                    return;
+                });
+            } else {
+                callback(err, null);
+                return;
+            }
+
+        });
+    }
+
+    // Return all Templates
+    this.getTemplates = function(orgList, callback) {
+        var templateList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelMastersTemplatesList.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, templates) {
+            if (err) {
+                callback(err, null);
+            }
+            if (templates) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < templates.length; i++) {
+                        if (templates[i].id === '17') {
+                            names = configmgmtDao.convertRowIDToValue(templates[i].orgname_rowid, rowidlist)
+                            templates[i].orgname = names;
+                            templateList.push(templates[i]);
+                        }
+                    }
+                    callback(null, templateList);
+                    return;
+                });
+            } else {
+                callback(null, templateList);
+                return;
+            }
+
+        });
+    }
+
+    // Return all TemplateTypes
+    this.getTemplateTypes = function(orgList, callback) {
+        logger.debug("getTemplateTypes called. ", JSON.stringify(orgList));
+        var templateTypeList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelMastersDesignTemplateTypes.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, templateTypes) {
+            if (err) {
+                callback(err, null);
+            }
+            if (templateTypes) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < templateTypes.length; i++) {
+                        if (templateTypes[i].id === '16') {
+                            names = configmgmtDao.convertRowIDToValue(templateTypes[i].orgname_rowid, rowidlist)
+                            templateTypes[i].orgname = names;
+                            templateTypeList.push(templateTypes[i]);
+                        }
+                    }
+                    callback(null, templateTypeList);
+                    return;
+                });
+            } else {
+                callback(null, templateTypeList);
+                return;
+            }
+
+        });
+    }
+
+    // Return all ServiceCommands
+    this.getServiceCommands = function(orgList, callback) {
+        var serviceCommandList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelMastersServicecommands.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, serviceCommands) {
+            if (serviceCommands) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < serviceCommands.length; i++) {
+                        if (serviceCommands[i].id === '19') {
+                            names = configmgmtDao.convertRowIDToValue(serviceCommands[i].orgname_rowid, rowidlist)
+                            serviceCommands[i].orgname = names;
+                            serviceCommandList.push(serviceCommands[i]);
+                        }
+                    }
+                    callback(null, serviceCommandList);
+                    return;
+                });
+            } else {
+                callback(err, null);
+                return;
+            }
+
+        });
+    }
+
+    // Return all Jenkins
+    this.getJenkins = function(orgList, callback) {
+        var jenkinList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelJenkinsConfig.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, jenkins) {
+            if (jenkins) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < jenkins.length; i++) {
+                        if (jenkins[i].id === '20') {
+                            names = configmgmtDao.convertRowIDToValue(jenkins[i].orgname_rowid, rowidlist)
+                            jenkins[i].orgname = names;
+                            jenkinList.push(jenkins[i]);
+                        }
+                    }
+                    callback(null, jenkinList);
+                    return;
+                });
+            } else {
+                callback(err, null);
+                return;
+            }
+
+        });
+    }
+
+    // Return All Orgs specific to User
+    this.getActiveOrgs = function(loggedInUser, callback) {
+        var orgList = [];
+        d4dModelNew.d4dModelMastersUsers.find({
+            loginname: loggedInUser
+        }, function(err, users) {
+            if (err) {
+                logger.debug("Unable to fetch User.");
+                callback(err, null);
+            }
+            logger.debug("Able to get User: ", JSON.stringify(users));
+            if (users) {
+                var count = 0;
+                var usrCount = 0;
+                var errOccured = false;
+                for (var x = 0; x < users.length; x++) {
+                    (function(countUser) {
+                        if (users[countUser].id === '7') {
+                            usrCount++;
+                            var orgIds = users[countUser].orgname_rowid;
+                            logger.debug("orgIds: ", typeof orgIds[0]);
+                            if (typeof orgIds[0] === 'undefined') {
+                                d4dModelNew.d4dModelMastersOrg.find({
+                                    id: "1",
+                                    active: true
+                                }, function(err, orgs) {
+                                    count++;
+                                    if (err) {
+                                        logger.debug("Unable to fetch Org.", err);
+                                        errOccured = true;
+                                        return;
+                                    }
+                                    if (orgs) {
+                                        for (var y = 0; y < orgs.length; y++) {
+                                            (function(countOrg) {
+                                                if (orgs[countOrg].id === '1') {
+                                                    logger.debug("Able to get Org.", JSON.stringify(orgs[countOrg]));
+                                                    orgList.push(orgs[countOrg]);
+                                                }
+                                            })(y);
+                                        }
+
+                                    }
+                                    if (count === usrCount) {
+                                        logger.debug("Returned Orgs: ", JSON.stringify(orgList));
+                                        callback(errOccured, orgList);
+                                    }
+
+
+                                });
+                            } else {
+
+                                logger.debug("Org orgIds for query: ", orgIds);
+                                d4dModelNew.d4dModelMastersOrg.find({
+                                    rowid: {
+                                        $in: orgIds
+                                    },
+                                    active: true
+                                }, function(err, orgs) {
+                                    count++;
+                                    if (err) {
+                                        logger.debug("Unable to fetch Org.", err);
+                                        errOccured = true;
+                                        return;
+                                    }
+                                    if (orgs) {
+                                        for (var y = 0; y < orgs.length; y++) {
+                                            (function(countOrg) {
+                                                if (orgs[countOrg].id === '1') {
+                                                    logger.debug("Able to get Org.", JSON.stringify(orgs[countOrg]));
+                                                    orgList.push(orgs[countOrg]);
+                                                }
+                                            })(y);
+                                        }
+                                    }
+                                    logger.debug('count ==>', count, "user length = >", usrCount);
+                                    if (count === usrCount) {
+                                        logger.debug("Returned Orgs: ", JSON.stringify(orgList));
+                                        callback(errOccured, orgList);
+                                    }
+                                });
+                            }
+                        }
+                    })(x);
+                }
+            } else {
+                callback(null, orgList);
+            }
+        });
+    }
+
+    this.getAllActiveOrg = function(callback) {
+        var orgList = [];
+        d4dModelNew.d4dModelMastersOrg.find({
+            id: "1",
+            active: true
+        }, function(err, orgs) {
+            if (err) {
+                callback(err, null);
+            }
+            if (orgs.length) {
+                for (var j1 = 0; j1 < orgs.length; j1++) {
+                    if (orgs[j1].id === '1') {
+                        orgList.push(orgs[j1]);
+                    }
+                }
+                callback(null, orgList);
+            } else {
+                callback(null, orgList);
+            }
+        });
+    }
+
+    this.getUserRoles = function(callback) {
+        var userRoleList = [];
+        d4dModelNew.d4dModelMastersUserroles.find({
+            id: "6"
+        }, function(err, userRoles) {
+            if (err) {
+                callback(err, null);
+            }
+            if (userRoles) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var j1 = 0; j1 < userRoles.length; j1++) {
+                        if (userRoles[j1].id === '6') {
+                            names = configmgmtDao.convertRowIDToValue(userRoles[j1].orgname_rowid, rowidlist)
+                            userRoles[j1].orgname = names;
+                            userRoleList.push(userRoles[j1]);
+                        }
+                    }
+                    callback(null, userRoleList);
+                    return;
+                });
+            } else {
+                callback(null, userRoleList);
+            }
+
+        });
+    }
+
+    // Return all Users whose are associated to loggedIn User
+    this.getUsers = function(loggedInUser, callback) {
+        var userList = [];
+        d4dModelNew.d4dModelMastersUsers.find({
+            loginname: loggedInUser
+        }, function(err, users) {
+            if (users) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < users.length; i++) {
+                        if (users[i].id === '7') {
+                            names = configmgmtDao.convertRowIDToValue(users[i].orgname_rowid, rowidlist)
+                            users[i].orgname = names;
+                            userList.push(users[i]);
+                        }
+                    }
+                    callback(null, userList);
+                    return;
+                });
+            } else {
+                callback(err, null);
+                return;
+            }
+
+        });
+    }
+
+    // Return all Users whose are associated to loggedIn User
+    this.getUsersForOrg = function(orgList, callback) {
+        var userList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelMastersUsers.find({
+            orgname_rowid: {
+                $in: rowIds
+            },
+            "id": "7"
+        }, function(err, users) {
+            if (users) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < users.length; i++) {
+                        if (users[i].id === '7') {
+                            names = configmgmtDao.convertRowIDToValue(users[i].orgname_rowid, rowidlist)
+                            users[i].orgname = names;
+                            userList.push(users[i]);
+                        }
+                    }
+                    callback(null, userList);
+                    return;
+                });
+            } else {
+                callback(err, null);
+                return;
+            }
+
+        });
+    }
+
+    // Return all Users whose are associated to loggedIn User
+    this.getUsersForOrgOrAll = function(orgList, callback) {
+        var userList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelMastersUsers.find({
+            $or: [{
+                orgname_rowid: {
+                    $in: rowIds
+                }
+            }, {
+                orgname_rowid: [""]
+            }]
+        }, function(err, users) {
+            if (users) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < users.length; i++) {
+                        if (users[i].id === '7') {
+                            names = configmgmtDao.convertRowIDToValue(users[i].orgname_rowid, rowidlist)
+                            users[i].orgname = names;
+                            userList.push(users[i]);
+                        }
+                    }
+                    callback(null, userList);
+                    return;
+                });
+            } else {
+                callback(err, null);
+                return;
+            }
+
+        });
+    }
+
+
+    this.getTeams = function(orgList, callback) {
+        var teamList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelMastersTeams.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, teams) {
+            if (err) {
+                callback(err, null);
+            }
+            logger.debug("Able to fetch Team: ", JSON.stringify(teams));
+            if (teams) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < teams.length; i++) {
+                        if (teams[i].id === '21') {
+                            names = configmgmtDao.convertRowIDToValue(teams[i].orgname_rowid, rowidlist)
+                            teams[i].orgname = names;
+                            var projectName = teams[i].projectname_rowid.split(",");
+                            for (var x = 0; x < projectName.length; x++) {
+                                projectnames = configmgmtDao.convertRowIDToValue(projectName[x], rowidlist);
+                                if (teams[i].projectname.indexOf(projectnames) === -1) {
+                                    teams[i].projectname = teams[i].projectname + "," + projectnames;
+                                }
+                            }
+                            teamList.push(teams[i]);
+                        }
+                    }
+                    callback(null, teamList);
+                    return;
+                });
+            } else {
+                callback(null, teamList);
+                return;
+            }
+        });
+    }
+
+    this.getOrgById = function(orgId, callback) {
+        var orgList = [];
+        logger.debug("Incomming orgid: ", orgId);
+        d4dModelNew.d4dModelMastersOrg.find({
+            _id: new ObjectId(orgId)
+        }, function(err, orgs) {
+            if (orgs) {
+                for (var i = 0; i < orgs.length; i++) {
+                    if (orgs[i].id === '1') {
+                        orgList.push(orgs[i]);
+                    }
+                }
+                callback(null, orgList);
+            } else {
+                callback(err, null);
+            }
+        });
+    }
+
+    this.getOrgByRowId = function(orgId, callback) {
+        var orgList = [];
+        d4dModelNew.d4dModelMastersOrg.find({
+            rowid: orgId,
+            id:'1'
+        }, function(err, orgs) {
+            if (orgs) {
+                for (var i = 0; i < orgs.length; i++) {
+                    if (orgs[i].id === '1') {
+                        orgList.push(orgs[i]);
+                    }
+                }
+                callback(null, orgList);
+            } else {
+                callback(err, null);
+            }
+        });
+    }
+
+    // Now not in use
+    getOrgsByRowIds = function(orgIds, callback) {
+        var orgList = [];
+        logger.debug("Incomming orgid: ", orgIds);
+        d4dModelNew.d4dModelMastersOrg.find({
+            rowid: {
+                $in: orgIds
+            }
+        }, function(err, orgs) {
+            if (orgs) {
+                for (var i = 0; i < orgs.length; i++) {
+                    if (orgs[i].id === '1') {
+                        orgList.push(orgs[i]);
+                    }
+                }
+                callback(null, orgList);
+            } else {
+                callback(err, null);
+            }
+        });
+    }
+
+    // Return only loggedIn User.
+    this.getLoggedInUser = function(loggedInUser, callback) {
+        var anUser;
+        d4dModelNew.d4dModelMastersUsers.find({
+            loginname: loggedInUser
+        }, function(err, users) {
+            if (users) {
+                for (var i = 0; i < users.length; i++) {
+                    if (users[i].id === '7') {
+                        anUser = users[i];
+                    }
+                }
+                callback(null, anUser);
+            } else {
+                callback(err, null);
+            }
+
+        });
+    }
+
+    // Return all settings for User.
+    this.getAllSettingsForUser = function(loggedInUser, callback) {
+        var userid;
+        var teams = [];
+        var orgs = [];
+        var projects = [];
+        var bunits = [];
+        var returnObj = [];
+        var catObj = {};
+        var orgObj = {};
+        var loopCount = 0;
+        d4dModelNew.d4dModelMastersUsers.find({
+            loginname: loggedInUser
+        }, function(err, users) {
+            if (users) {
+                for (var x = 0; x < users.length; x++) {
+                    (function(usr) {
+                        if (users[usr].id === '7') {
+                            logger.debug("Got User");
+                            catObj = {
+                                userid: users[usr].rowid,
+                                teams: [],
+                                orgs: [],
+                                projects: [],
+                                bunits: []
+                            };
+                            logger.debug("User Id: ", users[usr].rowid);
+                            d4dModelNew.d4dModelMastersTeams.find({
+                                loginname_rowid: {
+                                    $regex: users[usr].rowid
+                                },
+                                id: "21"
+                            }, function(err, team) {
+                                if (err) {
+                                    callback(err, null);
+                                    return;
+                                }
+
+                                logger.debug("Available team: ", JSON.stringify(team));
+                                if (typeof team === 'undefined' || team.length <= 0) {
+                                    callback(null, returnObj);
+                                    return;
+                                }
+                                if (team) {
+                                    for (var tm = 0; tm < team.length; tm++) {
+                                        if (team[tm].id === '21') {
+                                            logger.debug("Inside team : ", team[tm].rowid);
+                                            teams.push(team[tm].rowid);
+
+                                            var orgTm = team[tm].orgname_rowid[0];
+                                            if (!orgObj[orgTm]) {
+                                                orgObj[orgTm] = true;
+                                            }
+                                        }
+                                    }
+                                }
+                                logger.debug("Team array: ", JSON.stringify(teams));
+                                catObj.teams = teams;
+                                var allObj = Object.keys(orgObj);
+                                for (var tmOrg = 0; tmOrg < allObj.length; tmOrg++) {
+                                    loopCount++;
+                                    d4dModelNew.d4dModelMastersTeams.find({
+                                        orgname_rowid: allObj[tmOrg],
+                                        rowid: {
+                                            $in: catObj.teams
+                                        },
+                                        id: "21"
+                                    }, function(err, allTeams) {
+                                        if (err) {
+                                            callback(err, null);
+                                            return;
+                                        }
+                                        for (var xy = 0; xy < allTeams.length; xy++) {
+                                            (function(xy) {
+                                                if (typeof allTeams[xy].orgname_rowid != "undefined" && typeof allTeams[xy].projectname_rowid != "undefined") {
+                                                    d4dModelNew.d4dModelMastersOrg.find({
+                                                        rowid: {
+                                                            $in: allTeams[xy].orgname_rowid
+                                                        },
+                                                        id: "1",
+                                                        active: true
+                                                    }, function(err, org) {
+                                                        if (err) {
+                                                            callback(err, null);
+                                                        }
+                                                        if (org) {
+                                                            logger.debug("Available Org: ", JSON.stringify(org));
+                                                            for (var x = 0; x < org.length; x++) {
+                                                                if (org[x].id === '1') {
+                                                                    orgs.push(org[x].rowid);
+                                                                    logger.debug("Orgs list rowid: ", org[x].rowid);
+                                                                }
+                                                            }
+                                                            catObj.orgs = orgs;
+                                                        }
+                                                        d4dModelNew.d4dModelMastersProjects.find({
+                                                            orgname_rowid: {
+                                                                $in: allTeams[xy].orgname_rowid
+                                                            },
+                                                            rowid: {
+                                                                $in: allTeams[xy].projectname_rowid.split(",")
+                                                            },
+                                                            id: "4"
+                                                        }, function(err, project) {
+                                                            if (err) {
+                                                                callback(err, null);
+                                                            }
+                                                            if (project) {
+                                                                logger.debug("Available project: ", JSON.stringify(project));
+                                                                for (var x1 = 0; x1 < project.length; x1++) {
+                                                                    if (project[x1].id === '4') {
+                                                                        projects.push(project[x1].rowid);
+                                                                        logger.debug("projectList: ", project[x1].rowid);
+                                                                    }
+                                                                }
+                                                                catObj.projects = projects;
+                                                            }
+                                                            d4dModelNew.d4dModelMastersProductGroup.find({
+                                                                orgname_rowid: {
+                                                                    $in: allTeams[xy].orgname_rowid
+                                                                },
+                                                                id: "2"
+                                                            }, function(err, bg) {
+                                                                if (err) {
+                                                                    callback(err, null);
+                                                                }
+                                                                if (bg) {
+                                                                    for (var x2 = 0; x2 < bg.length; x2++) {
+                                                                        if (bg[x2].id === '2') {
+                                                                            bunits.push(bg[x2].rowid);
+                                                                        }
+                                                                    }
+                                                                    catObj.bunits = bunits;
+                                                                    returnObj.push(catObj);
+                                                                    logger.debug("returnObj: ", returnObj);
+                                                                    if (allObj.length === loopCount) {
+                                                                        logger.debug("Condition matched:");
+                                                                        callback(null, returnObj);
+                                                                        return;
+                                                                    }
+                                                                }
+                                                            });
+
+                                                        });
+                                                        // }
+
+                                                    });
+                                                } //if
+                                            })(xy);
+                                        }
+                                    });
+                                } // for multiple orgs
+
+                            });
+
+                        }
+                    })(x);
+                }
+            } else {
+                callback(err, returnObj);
+                return;
+            }
+
+        });
+    }
+
+    // check valid user permission
+    this.checkPermission = function(username, callback) {
+        logger.debug("User for permission: ", JSON.stringify(username));
+        this.getLoggedInUser(username, function(err, anUser) {
+            if (err) {
+                callback(err, null);
+            }
+            if (anUser) {
+                permissionsetDao.getPermissionSet(anUser.userrolename, function(err, permissionSet) {
+                    if (err) {
+                        callback(err, null);
+                    }
+                    if (permissionSet) {
+                        callback(null, permissionSet);
+                    } else {
+                        callback(null, []);
+                    }
+                });
+            } else {
+                callback(null, []);
+            }
+        });
+
+    }
+
+    // Now not in use
+    this.getJsonForNewTree = function(loggedInUser, callback) {
+        var jsonTree = [];
+        var businessGroups = [];
+        var projects = [];
+        var environments = [];
+        var orgObj = {};
+        this.getLoggedInUser(loggedInUser, function(err, anUser) {
+            if (err) {
+                callback(err, null);
+            }
+            if (anUser) {
+                this.getOrgsByRowIds(anUser.orgname_rowid, function(err, orgList) {
+                    if (err) {
+                        callback(err, null);
+                    }
+                    if (orgList) {
+                        for (var i = 0; i < orgList.length; i++) {
+                            (function(orgCount) {
+                                if (orgList[orgCount].id === "1") {
+                                    orgObj = {
+                                        name: orgList[orgCount].name,
+                                        orgid: orgList[orgCount].rowid,
+                                        rowid: orgList[orgCount].rowid,
+                                        businessGroups: [],
+                                        environments: []
+                                    };
+                                    d4dModelNew.d4dModelMastersProductGroup.find({
+                                        orgname_rowid: orgList[orgCount].rowid
+                                    }, function(err, bgs) {
+                                        if (err) {
+                                            callback(err, null);
+                                        }
+                                        if (bgs) {
+                                            for (var x = 0; x < bgs.length; x++) {
+                                                (function(bgCount) {
+                                                    if (bgs[bgCount].id === "2") {
+                                                        businessGroups.push(bgs[bgCount]);
+                                                        d4dModelNew.d4dModelMastersProjects.find({
+                                                            productgroupname_rowid: bgs[bgCount].rowid
+                                                        }, function(err, project) {
+                                                            if (err) {
+                                                                callback(err, null);
+                                                            }
+                                                            if (project) {
+                                                                for (var p = 0; p < project.length; p++) {
+                                                                    (function(pCount) {
+                                                                        if (project[pCount].id === "4") {
+                                                                            projects.push({
+                                                                                "name": bgs[bgCount].projectname,
+                                                                                "rowid": project[pCount].rowid,
+                                                                                "environments": project[pCount].environmentname
+                                                                            });
+                                                                        }
+                                                                    })(p);
+                                                                }
+                                                                businessGroups.push(projects);
+                                                            } else {
+                                                                callback(null, jsonTree);
+                                                            }
+                                                        })
+                                                    }
+
+                                                })(x);
+                                            }
+                                            orgObj.businessGroups = businessGroups;
+                                        } else {
+                                            callback(null, jsonTree);
+                                        }
+                                    });
+                                    d4dModelNew.d4dModelMastersEnvironments.find({
+                                        orgname_rowid: orgList[orgCount].rowid
+                                    }, function(err, envs) {
+                                        if (err) {
+                                            callback(err, null);
+                                        }
+                                        if (envs) {
+                                            for (var e = 0; e < envs.length; e++) {
+                                                (function(envCount) {
+                                                    if (envs[envCount].id === "3") {
+                                                        environments.push({
+                                                            "name": envs[envCount].environmentname,
+                                                            "rowid": envs[envCount].rowid
+                                                        });
+                                                    }
+                                                })(e);
+                                            }
+                                            orgObj.environments = environments;
+                                        } else {
+                                            callback(null, jsonTree);
+                                        }
+                                    })
+                                }
+                            })(i);
+                            jsonTree.push(orgObj);
+                        }
+
+                        callback(null, jsonTree);
+                    } else {
+                        callback(null, jsonTree);
+                    }
+                })
+            }
+        })
+    }
+
+    // check valid user permission
+    this.getProjectsForOrg = function(orgId, callback) {
+        var projectList = [];
+        d4dModelNew.d4dModelMastersProjects.find({
+            orgname_rowid: orgId
+        }, function(err, projects) {
+            if (err) {
+                callback(err, null);
+            }
+            if (projects) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < projects.length; i++) {
+                        (function(projectCount) {
+                            if (projects[projectCount].id === '4') {
+                                names = configmgmtDao.convertRowIDToValue(projects[projectCount].orgname_rowid, rowidlist);
+                                bgnames = configmgmtDao.convertRowIDToValue(projects[projectCount].productgroupname_rowid, rowidlist);
+                                projects[projectCount].orgname = names;
+                                projects[projectCount].productgroupname = bgnames;
+                                var envs = projects[projectCount].environmentname_rowid.split(",");
+                                for (var e = 0; e < envs.length; e++) {
+                                    envnames = configmgmtDao.convertRowIDToValue(envs[e], rowidlist);
+                                    allEnvs = allEnvs + "," + envnames;
+                                }
+                                allEnvs = allEnvs.substring(1);
+                                projects[projectCount].environmentname = allEnvs;
+                                projectList.push(projects[projectCount]);
+                            }
+                        })(i);
+                    }
+                    logger.debug("Returned Projects: ", JSON.stringify(projectList));
+                    callback(null, projectList);
+                    return;
+                });
+            } else {
+                callback(null, projectList);
+                return;
+            }
+        });
+
+    }
+
+    // Return all TemplateTypes
+    this.getTemplateTypesById = function(anId, callback) {
+        logger.debug("getTemplateTypesById called. ", JSON.stringify(anId));
+        var templateTypeList = [];
+        d4dModelNew.d4dModelMastersDesignTemplateTypes.find({
+            rowid: anId
+        }, function(err, templateTypes) {
+            if (err) {
+                callback(err, null);
+            }
+            if (templateTypes) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < templateTypes.length; i++) {
+                        if (templateTypes[i].id === '16') {
+                            names = configmgmtDao.convertRowIDToValue(templateTypes[i].orgname_rowid, rowidlist);
+                            templateTypes[i].orgname = names;
+                            templateTypeList.push(templateTypes[i]);
+                        }
+                    }
+                    callback(null, templateTypeList);
+                    return;
+                });
+            } else {
+                callback(null, templateTypeList);
+                return;
+            }
+
+        });
+    }
+
+    this.updateAllSettings = function(orgId, orgName, callback) {
+        d4dModelNew.d4dModelMastersOrg.find({
+            rowid: orgId
+        }, function(err, org) {
+            if (err) {
+                callback(err, null);
+                return;
+            }
+            d4dModelNew.d4dModelMastersProductGroup.update({
+                orgname_rowid: orgId,
+                id: '2'
+            }, {
+                $set: {
+                    orgname: orgName
+                }
+            }, function(err, aBody) {
+                if (err) {
+                    logger.debug("Error to update Settings.");
+                }
+
+                d4dModelNew.d4dModelMastersProjects.update({
+                    orgname_rowid: orgId,
+                    id: '4'
+                }, {
+                    $set: {
+                        orgname: orgName
+                    }
+                }, function(err, aBody) {
+                    if (err) {
+                        logger.debug("Error to update Settings.");
+                    }
+
+                    d4dModelNew.d4dModelMastersEnvironments.update({
+                        orgname_rowid: orgId,
+                        id: '3'
+                    }, {
+                        $set: {
+                            orgname: orgName
+                        }
+                    }, function(err, aBody) {
+                        if (err) {
+                            logger.debug("Error to update Settings.");
+                        }
+
+                        d4dModelNew.d4dModelMastersConfigManagement.update({
+                            orgname_rowid: orgId,
+                            id: '10'
+                        }, {
+                            $set: {
+                                orgname: orgName
+                            }
+                        }, function(err, aBody) {
+                            if (err) {
+                                logger.debug("Error to update Settings.");
+                            }
+                            d4dModelNew.d4dModelMastersDockerConfig.update({
+                                orgname_rowid: orgId,
+                                id: '18'
+                            }, {
+                                $set: {
+                                    orgname: orgName
+                                }
+                            }, function(err, aBody) {
+                                if (err) {
+                                    logger.debug("Error to update Settings.");
+                                }
+                                d4dModelNew.d4dModelMastersUsers.update({
+                                    orgname_rowid: orgId,
+                                    id: '7'
+                                }, {
+                                    $set: {
+                                        orgname: orgName
+                                    }
+                                }, function(err, aBody) {
+                                    if (err) {
+                                        logger.debug("Error to update Settings.");
+                                    }
+                                    d4dModelNew.d4dModelMastersUserroles.update({
+                                        orgname_rowid: orgId,
+                                        id: '6'
+                                    }, {
+                                        $set: {
+                                            orgname: orgName
+                                        }
+                                    }, function(err, aBody) {
+                                        if (err) {
+                                            logger.debug("Error to update Settings.");
+                                        }
+                                        d4dModelNew.d4dModelMastersDesignTemplateTypes.update({
+                                            orgname_rowid: orgId,
+                                            id: '16'
+                                        }, {
+                                            $set: {
+                                                orgname: orgName
+                                            }
+                                        }, function(err, aBody) {
+                                            if (err) {
+                                                logger.debug("Error to update Settings.");
+                                            }
+                                            d4dModelNew.d4dModelMastersTemplatesList.update({
+                                                orgname_rowid: orgId,
+                                                id: '17'
+                                            }, {
+                                                $set: {
+                                                    orgname: orgName
+                                                }
+                                            }, function(err, aBody) {
+                                                if (err) {
+                                                    logger.debug("Error to update Settings.");
+                                                }
+                                                d4dModelNew.d4dModelMastersServicecommands.update({
+                                                    orgname_rowid: orgId,
+                                                    id: '19'
+                                                }, {
+                                                    $set: {
+                                                        orgname: orgName
+                                                    }
+                                                }, function(err, aBody) {
+                                                    if (err) {
+                                                        logger.debug("Error to update Settings.");
+                                                    }
+                                                    d4dModelNew.d4dModelJenkinsConfig.update({
+                                                        orgname_rowid: orgId,
+                                                        id: '20'
+                                                    }, {
+                                                        $set: {
+                                                            orgname: orgName
+                                                        }
+                                                    }, function(err, aBody) {
+                                                        if (err) {
+                                                            logger.debug("Error to update Settings.");
+                                                        }
+                                                        d4dModelNew.d4dModelMastersTeams.find({
+                                                            orgname_rowid: orgId,
+                                                            id: '21'
+                                                        }, function(err, teams) {
+                                                            if (err) {
+                                                                logger.debug("Error to get Settings.");
+                                                            }
+
+                                                            d4dModelNew.d4dModelMastersTeams.update({
+                                                                orgname_rowid: {
+                                                                    $in: orgId
+                                                                },
+                                                                id: '21'
+                                                            }, {
+                                                                $set: {
+                                                                    orgname: orgName
+                                                                }
+                                                            }, function(err, aBody) {
+                                                                if (err) {
+                                                                    logger.debug("Error to update Settings.");
+                                                                }
+                                                                callback(null, aBody);
+                                                                return;
+                                                            });
+                                                        });
+                                                    });
+                                                });
+                                            });
+                                        });
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+            }); // bu
+        });
+    }
+
+    this.updateTeam = function(orgId, callback) {
+        var teamName = '';
+        var teamDescription = '';
+        configmgmtDao.getRowids(function(err, rowidlist) {
+            d4dModelNew.d4dModelMastersTeams.find({
+                orgname_rowid: orgId,
+                id: '21'
+            }, function(err, teams) {
+                if (err) {
+                    logger.debug("Error to get Settings.");
+                }
+                for (var t = 0; t < teams.length; t++) {
+                    names = configmgmtDao.convertRowIDToValue(teams[t].orgname_rowid, rowidlist);
+                    var currentTeamName = teams[t].teamname;
+                    if (currentTeamName.substr(currentTeamName.indexOf("_")) === "_Admins") {
+                        teamName = names + "_Admins";
+                        teamDescription = "Team For " + teamName;
+                    } else if (currentTeamName.substr(currentTeamName.indexOf("_")) === "_DEV") {
+                        teamName = names + "_DEV";
+                        teamDescription = "Team For " + teamName;
+                    } else if (currentTeamName.substr(currentTeamName.indexOf("_")) === "_QA") {
+                        teamName = names + "_QA";
+                        teamDescription = "Team For " + teamName;
+                    } else if (currentTeamName.substr(currentTeamName.indexOf("_")) === "_DevOps") {
+                        teamName = names + "_DevOps";
+                        teamDescription = "Team For " + teamName;
+                    }
+                    if (currentTeamName.substr(currentTeamName.indexOf("_")) === "_Admins" || currentTeamName.substr(currentTeamName.indexOf("_")) === "_DEV" || currentTeamName.substr(currentTeamName.indexOf("_")) === "_QA" || currentTeamName.substr(currentTeamName.indexOf("_")) === "_DevOps") {
+                        d4dModelNew.d4dModelMastersTeams.update({
+                            rowid: teams[t].rowid,
+                            id: '21'
+                        }, {
+                            $set: {
+                                teamname: teamName,
+                                descriptions: teamDescription
+                            }
+                        }, function(err, aBody) {
+                            if (err) {
+                                logger.debug("Error to update Settings.");
+                            }
+                            logger.debug("Settings Updated: ", JSON.stringify(aBody));
+                        });
+                    }
+
+                }
+            });
+        });
+    };
+
+    this.getBusinessGroupsByOrgId = function(orgId, callback) {
+        d4dModelNew.d4dModelMastersProductGroup.find({
+            orgname_rowid: orgId,
+            id:'2'
+        }, function(err, productGroupData) {
+            if(err) {
+                logger.debug("getBusinessGroupsByOrgId: "+err);
+                callback(err, null);
+            }
+            callback(null, productGroupData);
+
+        });
+    };
+    this.getProjectsBybgId = function(bgId, callback) {
+        d4dModelNew.d4dModelMastersProjects.find({
+            productgroupname_rowid: bgId,
+            id:'4'
+        }, function(err, projectData) {
+            if(err) {
+                logger.debug("getProjectsBybgId: "+err);
+                callback(err, null);
+            }
+            callback(null, projectData);
+
+        });
+    };
+
+    this.getUsersForAllOrg = function(callback) {
+        logger.debug("getUsersForAllOrg called. ");
+        d4dModelNew.d4dModelMastersUsers.find({
+            id: "7",
+            orgname_rowid: {
+                $in: [""]
+            }
+        }, function(err, users) {
+            if (err) {
+                callback(err, null);
+                return;
+            }
+            logger.debug("Got users for Org All.", JSON.stringify(users));
+            if (users.length > 0) {
+                callback(null, users);
+                return;
+            } else {
+                callback(null, []);
+                return;
+            }
+
+        });
+    }
+
+    var getPermissionForCategory = function(category, permissionto, permissionset) {
+        var perms = [];
+        if (permissionset) {
+            for (var i = 0; i < permissionset.length; i++) {
+                var obj = permissionset[i].permissions;
+                for (var j = 0; j < obj.length; j++) {
+                    if (obj[j].category == category) {
+                        var acc = obj[j].access.toString().split(',');
+                        for (var ac in acc) {
+                            if (perms.indexOf(acc[ac]) < 0)
+                                perms.push(acc[ac]);
+                        }
+
+                    }
+                }
+            }
+            if (perms.indexOf(permissionto) >= 0) {
+                return (true);
+            } else
+                return (false);
+        } else {
+            return (false);
+        }
+    };
+
+    // Check wheather permission is there for user or not.
+    this.hasPermission = function(category, permissionto, sessionUser, callback) {
+        var retVal = '';
+        retVal = getPermissionForCategory(category, permissionto, sessionUser.permissionset);
+        callback(null, retVal);
+    };
+
+    // Return all Puppet Servers specific to User
+    this.getPuppetServers = function(orgList, callback) {
+        var congifMgmtList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelMastersPuppetServer.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, configMgmt) {
+            if (configMgmt) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < configMgmt.length; i++) {
+                        if (configMgmt[i].id === '25') {
+                            names = configmgmtDao.convertRowIDToValue(configMgmt[i].orgname_rowid, rowidlist)
+                            configMgmt[i].orgname = names;
+                            congifMgmtList.push(configMgmt[i]);
+                        }
+                    }
+                    callback(null, congifMgmtList);
+                    return;
+                });
+            } else {
+                callback(err, null);
+                return;
+            }
+        });
+    }
+    this.getServerDetails=function(jsonData,callBack){
+        var serverDetail=[];
+        d4dModelNew.d4dModelMastersDockerConfig.find({
+            orgname_rowid:jsonData.orgId,
+            id:jsonData.dockerId
+        },function(err,dockerData){
+            if(err){
+                callBack(err,null);
+                return;
+            }
+            serverDetail=dockerData;
+            d4dModelNew.d4dModelMastersNexusServer.find({
+                orgname_rowid:jsonData.orgId,
+                id:jsonData.nexusId
+            },function(err,nexusData){
+                if(err){
+                    callBack(err,null);
+                    return;
+                }
+                for(var i = 0; i <nexusData.length; i++){
+                    serverDetail.push(nexusData[i])
+                }
+                callBack(null,serverDetail);
+            })
+        })
+    }
+
+
+
+
+
+    this.getDockerServer=function(jsonData,callBack){
+        d4dModelNew.d4dModelMastersDockerConfig.find({
+            orgname_rowid:jsonData.orgId,
+            id:jsonData.dockerId
+        },function(err,dockerData){
+            if(err){
+                callBack(err,null);
+                return;
+            }
+            callBack(null,dockerData);
+        })
+    }
+
+    this.getNexusServer=function(jsonData,callBack){
+        d4dModelNew.d4dModelMastersNexusServer.find({
+            orgname_rowid:jsonData.orgId,
+            id:jsonData.nexusId
+        },function(err,nexusData){
+            if(err){
+                callBack(err,null);
+                return;
+            }
+            callBack(null,nexusData);
+        })
+    }
+
+
+
+
+    // Return all Nexus Servers specific to User
+    this.getNexusServers = function(orgList, callback) {
+        var congifMgmtList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelMastersNexusServer.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, configMgmt) {
+            if (configMgmt) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < configMgmt.length; i++) {
+                        if (configMgmt[i].id === '26') {
+                            names = configmgmtDao.convertRowIDToValue(configMgmt[i].orgname_rowid, rowidlist)
+                            configMgmt[i].orgname = names;
+                            congifMgmtList.push(configMgmt[i]);
+                        }
+                    }
+                    callback(null, congifMgmtList);
+                    return;
+                });
+            } else {
+                callback(err, null);
+                return;
+            }
+        });
+    }
+
+    // Return all Puppet Servers specific to User
+    this.getAllCongifMgmts = function(orgList, callback) {
+        var congifMgmtList = [];
+        var rowIds = [];
+        for (var x = 0; x < orgList.length; x++) {
+            rowIds.push(orgList[x].rowid);
+        }
+        logger.debug("org rowids: ", rowIds);
+        d4dModelNew.d4dModelMastersPuppetServer.find({
+            orgname_rowid: {
+                $in: rowIds
+            }
+        }, function(err, configMgmt) {
+            d4dModelNew.d4dModelMastersConfigManagement.find({
+                orgname_rowid: {
+                    $in: rowIds
+                }
+            }, function(err, chefmgmt) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    if (configMgmt) {
+                        for (var i = 0; i < configMgmt.length; i++) {
+                            if (configMgmt[i].id === '25') {
+                                names = configmgmtDao.convertRowIDToValue(configMgmt[i].orgname_rowid, rowidlist)
+                                configMgmt[i].orgname = names;
+                                congifMgmtList.push(configMgmt[i]);
+                            }
+                        }
+                    }
+                    if (chefmgmt) {
+                        for (var j = 0; j < chefmgmt.length; j++) {
+                            if (chefmgmt[j].id === '10') {
+                                names = configmgmtDao.convertRowIDToValue(chefmgmt[j].orgname_rowid, rowidlist)
+                                chefmgmt[j].orgname = names;
+                                congifMgmtList.push(chefmgmt[j]);
+                            }
+                        }
+                    }
+                    callback(null, congifMgmtList);
+                });
+            });
+        });
+    }
+
+    // Return all Puppet Servers specific to User
+    this.getAllCongifMgmtsForOrg = function(orgId, callback) {
+        logger.debug("Entered..", orgId);
+        var congifMgmtList = [];
+        d4dModelNew.d4dModelMastersPuppetServer.find({
+            orgname_rowid: orgId
+        }, function(err, configMgmt) {
+            d4dModelNew.d4dModelMastersConfigManagement.find({
+                orgname_rowid: orgId
+            }, function(err, chefmgmt) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    if (configMgmt) {
+                        for (var i = 0; i < configMgmt.length; i++) {
+                            if (configMgmt[i].id === '25') {
+                                names = configmgmtDao.convertRowIDToValue(configMgmt[i].orgname_rowid, rowidlist)
+                                configMgmt[i].orgname = names;
+                                congifMgmtList.push(configMgmt[i]);
+                            }
+                        }
+                    }
+                    if (chefmgmt) {
+                        for (var j = 0; j < chefmgmt.length; j++) {
+                            if (chefmgmt[j].id === '10') {
+                                names = configmgmtDao.convertRowIDToValue(chefmgmt[j].orgname_rowid, rowidlist)
+                                chefmgmt[j].orgname = names;
+                                congifMgmtList.push(chefmgmt[j]);
+                            }
+                        }
+                    }
+                    callback(null, congifMgmtList);
+                });
+            });
+        });
+    }
+
+    // Return all Puppet Servers specific to User
+    this.getCongifMgmtsById = function(anId, callback) {
+        logger.debug("Entered..", anId);
+        d4dModelNew.d4dModelMastersPuppetServer.find({
+            rowid: anId,
+            id: "25"
+        }, function(err, configMgmt) {
+            if (err) {
+                callback(err, null);
+                return;
+            }
+            configmgmtDao.getRowids(function(err, rowidlist) {
+                if (err) {
+                    callback(err, null);
+                    return;
+                }
+                if (configMgmt.length) {
+                    names = configmgmtDao.convertRowIDToValue(configMgmt[0].orgname_rowid, rowidlist);
+                    configMgmt[0].orgname = names;
+                    if (configMgmt[0].userpemfile_filename) {
+                        configMgmt[0].pemFileLocation = appConfig.puppet.puppetReposLocation + configMgmt[0].orgname_rowid[0] + '/' + configMgmt[0].folderpath + configMgmt[0].userpemfile_filename
+                    }
+                    callback(null, configMgmt[0]);
+                    return;
+                }
+                d4dModelNew.d4dModelMastersConfigManagement.find({
+                    rowid: anId,
+                    id: "10"
+                }, function(err, chefmgmt) {
+                    if (err) {
+                        callback(err, null);
+                        return;
+                    }
+                    if (chefmgmt.length) {
+
+                        names = configmgmtDao.convertRowIDToValue(chefmgmt[0].orgname_rowid, rowidlist);
+                        chefmgmt[0].orgname = names;
+
+                        chefmgmt[0].chefRepoLocation = chefSettings.chefReposLocation + chefmgmt[0].orgname_rowid[0] + '/' + chefmgmt[0].loginname + '/';
+                        chefmgmt[0].userpemfile = chefSettings.chefReposLocation + chefmgmt[0].orgname_rowid[0] + '/' + chefmgmt[0].folderpath + chefmgmt[0].userpemfile_filename;
+                        chefmgmt[0].validatorpemfile = chefSettings.chefReposLocation + chefmgmt[0].orgname_rowid[0] + '/' + chefmgmt[0].folderpath + chefmgmt[0].validatorpemfile_filename;
+
+                        callback(null, chefmgmt[0]);
+                    } else {
+                        callback(null, null);
+                    }
+                });
+            });
+        });
+    }
+
+    // Return Environment Name
+    this.getEnvironmentName = function(envId, callback) {
+        logger.debug("org rowids: ", envId);
+        d4dModelNew.d4dModelMastersEnvironments.find({
+            rowid: envId,
+            "id": 3
+        }, function(err, envs) {
+            if (err) {
+                callback(err, null);
+            }
+            if (envs.length) {
+                logger.debug("Got Environment: ", JSON.stringify(envs));
+                callback(null, envs[0].environmentname);
+                return;
+            } else {
+                callback(null, null);
+                return;
+            }
+        });
+    };
+
+    this.getChefDetailsByOrgId = function(orgId, callback) {
+        d4dModelNew.d4dModelMastersConfigManagement.find({
+            orgname_rowid: orgId,
+            "id": '10'
+        }, function(err, chefDetails) {
+            if (err) {
+                callback(err, null);
+            }else {
+                callback(null, chefDetails);
+            }
+        });
+    };
+
+    this.getEnvironmentByEnvId = function(envId, callback) {
+        logger.debug("org rowids: ", envId);
+        d4dModelNew.d4dModelMastersEnvironments.find({
+            rowid: envId,
+            "id": 3
+        }, function(err, envs) {
+            if (err) {
+                callback(err, null);
+            }
+            callback(null, envs[0]);
+            return;
+        });
+    }
+
+    // Return Project Name
+    this.getProjectName = function(projectId, callback) {
+        logger.debug("Project rowids: ", projectId);
+        d4dModelNew.d4dModelMastersProjects.find({
+            rowid: projectId
+        }, function(err, projects) {
+            if (err) {
+                callback(err, null);
+            }
+            if (projects.length) {
+                logger.debug("Got Environment: ", JSON.stringify(projects));
+                callback(null, projects[0].projectname);
+                return;
+            } else {
+                callback(null, null);
+                return;
+            }
+        });
+    }
+
+    // Get all appData informations.
+    this.getAppDataWithDeployList = function(envName, projectId, callback) {
+        logger.debug("projectId: ", projectId);
+        AppDeploy.getAppDeployListByEnvId(projectId, envName, function(err, data) {
+            if (err) {
+                logger.debug("App deploy fetch error.", err);
+            }
+            callback(null,data);
+        });
+    };
+
+    // Get AppDeploy by name.
+    this.getAppDataByName = function(envName, appName, projectId, callback) {
+        d4dModelNew.d4dModelMastersProjects.find({
+            appdeploy: {
+                $elemMatch: {
+                    applicationname: appName
+                }
+            },
+            rowid: projectId
+        }, function(err, anAppData) {
+            if (err) {
+                logger.debug("Got error while fetching appData: ", err);
+                callback(err, null);
+            }
+            if (anAppData.length) {
+                var appData = [];
+
+                AppDeploy.getAppDeployByNameAndEnvId(appName, envName, function(err, data) {
+                    if (err) {
+                        logger.debug("App deploy fetch error.", err);
+                    }
+                    if (data.length) {
+                        for (var i = 0; i < data.length; i++) {
+                            var dummyData = {
+                                _id: data[i]._id,
+                                applicationName: data[i].applicationName,
+                                applicationInstanceName: data[i].applicationInstanceName,
+                                applicationVersion: data[i].applicationVersion,
+                                applicationNodeIP: data[i].applicationNodeIP,
+                                applicationLastDeploy: data[i].applicationLastDeploy,
+                                applicationStatus: data[i].applicationStatus,
+                                projectId: anAppData[0].rowid,
+                                envId: data[i].envId,
+                                description: anAppData[0].description,
+                                applicationType: data[i].applicationType,
+                                containerId: data[i].containerId,
+                                hostName: data[i].hostName
+                            };
+                            appData.push(dummyData);
+                        }
+                        callback(null, appData);
+                    } else {
+                        callback(null, data);
+                    }
+                });
+            } else {
+                logger.debug("Else part..");
+                callback(null, anAppData);
+            }
+        });
+    };
+
+    // Return particular Projects specific to User
+    this.getParticularProject = function(projectId, callback) {
+        var projectList = [];
+        d4dModelNew.d4dModelMastersProjects.find({
+            id: "4",
+            rowid: projectId
+        }, function(err, projects) {
+            if (err) {
+                callback(err, null);
+            }
+            if (projects) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    var allEnvs = '';
+                    for (var i = 0; i < projects.length; i++) {
+                        (function(projectCount) {
+                            if (projects[projectCount].id === '4') {
+                                names = configmgmtDao.convertRowIDToValue(projects[projectCount].orgname_rowid, rowidlist);
+                                bgnames = configmgmtDao.convertRowIDToValue(projects[projectCount].productgroupname_rowid, rowidlist);
+                                projects[projectCount].orgname = names;
+                                projects[projectCount].productgroupname = bgnames;
+                                projectList.push(projects[projectCount]);
+                            }
+                        })(i);
+                    }
+                    logger.debug("Returned Projects: ", JSON.stringify(projectList));
+                    callback(null, projectList);
+                    return;
+                });
+            } else {
+                callback(null, projectList);
+                return;
+            }
+        });
+    }
+
+    this.updateParticularProject = function(projectData, callback) {
+        d4dModelNew.d4dModelMastersProjects.update({
+            id: "4",
+            rowid: projectData.projectId
+        },{
+            $set: {
+                environmentname:projectData.envNames,
+                environmentname_rowid:projectData.envIds
+            }
+        }, {
+            upsert: false
+        }, function(err, projects) {
+            if (err) {
+                callback(err, null);
+            } else {
+                callback(null, projects);
+            }
+        });
+    }
+
+
+
+    // Return Docker
+    this.getDockerById = function(anId, callback) {
+        d4dModelNew.d4dModelMastersDockerConfig.find({
+            rowid: anId,
+            id: "18"
+        }, function(err, dockers) {
+            if (err) {
+                logger.debug("Error to get Docker: ", err);
+                callback(err, null);
+                return;
+            }
+            callback(null, dockers);
+            return;
+        });
+    }
+
+    // Return all Templates for Org and TemplateType
+    this.getTemplatesByOrgAndTemplateType = function(orgId, templateType, callback) {
+        var templateList = [];
+        var rowIds = [];
+        rowIds.push(orgId);
+        d4dModelNew.d4dModelMastersTemplatesList.find({
+            orgname_rowid: {
+                $in: rowIds
+            },
+            templatetypename: templateType
+        }, function(err, templates) {
+            if (err) {
+                callback(err, null);
+            }
+            if (templates) {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    for (var i = 0; i < templates.length; i++) {
+                        if (templates[i].id === '17') {
+                            names = configmgmtDao.convertRowIDToValue(templates[i].orgname_rowid, rowidlist)
+                            templates[i].orgname = names;
+                            templateList.push(templates[i]);
+                        }
+                    }
+                    callback(null, templateList);
+                    return;
+                });
+            } else {
+                callback(null, templateList);
+                return;
+            }
+        });
+    }
+
+
+    // Get all appDeploy informations for project.
+    // Note: This method logic has to change with stored procedure for better performance.
+    // For now due to time constraints implementing with for loop.(Gobinda)
+    this.getAppDeployListForProject = function getAppDeployListForProject(projectId, callback) {
+        logger.debug("projectId: ", projectId);
+        d4dModelNew.d4dModelMastersProjects.find({
+            rowid: projectId,
+            id: '4'
+        }, function(err, project) {
+            if (err) {
+                logger.error("Failed to get project. ", err);
+                return callback(err, null);
+            }
+            if (project.length) {
+                AppDeploy.getAppDeployByProjectId(projectId, function(err, appData) {
+                    if (err) {
+                        logger.debug("App deploy fetch error.", err);
+                        return callback(err, null);
+                    }
+                    if (appData.length) {
+                        var filterArray = [];
+                        var finalJson = [];
+                        for (var j = 0; j < appData.length; j++) {
+                            var str = appData[j].applicationName + "@" + appData[j].applicationVersion;
+                            if (filterArray.length === 0) {
+                                filterArray.push(str);
+                            }
+                            if (filterArray.indexOf(str) === -1) {
+                                filterArray.push(str);
+                            }
+                        }
+                        logger.debug("created array: ", JSON.stringify(filterArray));
+                        var count = 0;
+                        for (var k = 0; k < filterArray.length; k++) {
+                            (function(k) {
+                                var arrayValue = filterArray[k].split("@");
+                                logger.debug("name: ", arrayValue[0]);
+                                logger.debug("Version: ", arrayValue[1]);
+                                AppDeploy.getAppDeployByAppNameAndVersion(projectId,arrayValue[0], arrayValue[1], function(err, filteredData) {
+                                    count++;
+                                    if (err) {
+                                        logger.error("Failed to get filteredData: ", err);
+                                        return;
+                                    }
+                                    logger.debug("filteredData array: ", JSON.stringify(filteredData));
+                                    if (filteredData.length) {
+                                        var applicationName = filteredData[0].applicationName;
+                                        var applicationVersion = filteredData[0].applicationVersion;
+                                        var projectId = filteredData[0].projectId;
+                                        var applicationInstanceName = [];
+                                        var applicationNodeIP = [];
+                                        var applicationLastDeploy = [];
+                                        var applicationStatus = [];
+                                        var containerId = [];
+                                        var hostName = [];
+                                        var envId = [];
+                                        var appLog = [];
+                                        for (var l = 0; l < filteredData.length; l++) {
+                                            applicationInstanceName.push(filteredData[l].applicationInstanceName);
+                                            applicationNodeIP.push(filteredData[l].applicationNodeIP);
+                                            applicationLastDeploy.push(filteredData[l].applicationLastDeploy);
+                                            applicationStatus.push(filteredData[l].applicationStatus);
+                                            containerId.push(filteredData[l].containerId);
+                                            hostName.push(filteredData[l].hostName);
+                                            envId.push(filteredData[l].envId);
+                                            appLog.push(filteredData[l].appLogs);
+                                        }
+                                        var tempJson = {
+                                            "applicationName": applicationName,
+                                            "applicationVersion": applicationVersion,
+                                            "projectId": projectId,
+                                            "applicationInstanceName": applicationInstanceName,
+                                            "applicationNodeIP": applicationNodeIP,
+                                            "applicationLastDeploy": applicationLastDeploy,
+                                            "applicationStatus": applicationStatus,
+                                            "containerId": containerId,
+                                            "hostName": hostName,
+                                            "envId": envId,
+                                            "appLogs": appLog
+                                        };
+                                        finalJson.push(tempJson);
+                                        if (filterArray.length === count) {
+                                            logger.debug("Send finalJson: ", JSON.stringify(finalJson));
+                                            return callback(null, finalJson);
+                                        }
+                                    } else {
+                                        return;
+                                    }
+                                });
+                            })(k);
+                        }
+
+                    } else {
+                        return callback(null, []);
+                    }
+                });
+            } else {
+                return callback(null, null);
+            }
+        });
+    };
+
+    // update project with app name
+    this.updateProject = function(projectId, appName, callback) {
+        var appDescription = appName + " deployed.";
+        var count = 0;
+        d4dModelNew.d4dModelMastersProjects.find({
+            rowid: projectId,
+            id: '4'
+        }, function(err, project) {
+            if (err) {
+                logger.debug("Failed to find Project", err);
+                return;
+            }
+            if (project.length) {
+                var appdeploy = project[0].appdeploy;
+                if (appdeploy.length) {
+                    for (var i = 0; i < appdeploy.length; i++) {
+                        if (appdeploy[i].applicationname === appName) {
+                            count++;
+                        }
+                    }
+                    if (!count) {
+                        d4dModelNew.d4dModelMastersProjects.update({
+                            rowid: projectId,
+                            id: '4'
+                        }, {
+                            $push: {
+                                "appdeploy": {
+                                    applicationname: appName,
+                                    appdescription: appDescription
+                                }
+                            }
+                        }, {
+                            upsert: false
+                        }, function(err, data) {
+                            if (err) {
+                                logger.debug('Err while updating d4dModelMastersProjects' + err);
+                                callback(err, null);
+                                return;
+                            }
+                            logger.debug('Updated project ');
+                            callback(null, data);
+                            return;
+                        });
+                    } else {
+                        callback(null, []);
+                        return;
+                    }
+                } else {
+                    d4dModelNew.d4dModelMastersProjects.update({
+                        rowid: projectId,
+                        id: '4'
+                    }, {
+                        $push: {
+                            "appdeploy": {
+                                applicationname: appName,
+                                appdescription: appDescription
+                            }
+                        }
+                    }, {
+                        upsert: false
+                    }, function(err, data) {
+                        if (err) {
+                            logger.debug('Err while updating d4dModelMastersProjects' + err);
+                            callback(err, null);
+                            return;
+                        }
+                        logger.debug('Updated project ');
+                        callback(null, data);
+                        return;
+                    });
+                }
+            }
+        });
+    };
+
+    this.getTemplateById = function(templateId, callback) {
+        d4dModelNew.d4dModelMastersTemplatesList.find({
+            rowid: templateId
+        }, function(err, templates) {
+            if(err) {
+                return callback(err);
+            }
+            return callback(null,templates);
+        });
+    };
+}
+
+module.exports = new MasterUtil();
\ No newline at end of file
diff --git a/server/app/model/d4dmasters/configmgmt.js b/server/app/model/d4dmasters/configmgmt.js
index 36f151b7c..4cb239a2c 100755
--- a/server/app/model/d4dmasters/configmgmt.js
+++ b/server/app/model/d4dmasters/configmgmt.js
@@ -109,6 +109,19 @@ function Configmgmt() {
                 logger.log('Exting getDBModelFromID ' + id.toString());
                 callback(null, 'd4dModelMastersNexusServer');
                 break;
+            case "27":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelBitbucketConfig');
+                break;
+            case "28":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelOctopusConfig');
+                break;
+            case "29":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelFunctionalTestConfig');
+                break;
+            
         }
     };
 
@@ -183,6 +196,20 @@ function Configmgmt() {
                 logger.log('Exting getDBModelFromID ' + id.toString());
                 return ('nexusserver');
                 break;
+            case "27":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('bitbucketserver');
+                break;
+            case "28":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('octopusserver');
+                break;
+            case "29":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('fuctionaltestserver');
+                break;
+
+                
 
         };
     };
diff --git a/server/app/model/d4dmasters/configmgmt.js.bak b/server/app/model/d4dmasters/configmgmt.js.bak
new file mode 100644
index 000000000..36f151b7c
--- /dev/null
+++ b/server/app/model/d4dmasters/configmgmt.js.bak
@@ -0,0 +1,1438 @@
+/*
+Copyright [2016] [Relevance Lab]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
+var d4dModel = require('./d4dmastersmodel.js');
+var d4dModelNew = require('./d4dmastersmodelnew.js');
+var codelist = require('../../codelist.json');
+var appConfig = require('_pr/config');
+var chefSettings = appConfig.chef;
+var puppetSettings = appConfig.puppet;
+var logger = require('_pr/logger')(module);
+var blueprintdao = require('../dao/blueprints.js');
+var instancedao = require('../classes/instance/instance.js');
+
+function Configmgmt() {
+    this.getDBModelFromID = function(id, callback) {
+        logger.log('Entering getDBModelFromID');
+        switch (id.toString()) {
+            case "1":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersOrg');
+                break;
+            case "2":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersProductGroup');
+                break;
+            case "3":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersEnvironments');
+                break;
+            case "4":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersProjects');
+                break;
+            case "5":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersProjects');
+                break;
+            case "6":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersUserroles');
+                break;
+            case "7":
+                logger.log('Exting getDBModelFromID  ' + id.toString());
+                callback(null, 'd4dModelMastersUsers');
+                break;
+            case "8":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersglobalaccess');
+                break;
+            case "9":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersProviders');
+                break;
+            case "10":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersConfigManagement');
+                break;
+            case "16":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersDesignTemplateTypes');
+                break;
+            case "17":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersTemplatesList');
+                break;
+            case "18":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersDockerConfig');
+                break;
+            case "19":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersServicecommands');
+                break;
+            case "20":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelJenkinsConfig');
+                break;
+            case "21":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersTeams');
+                break;
+            case "22":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersImages');
+                break;
+            case "23":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersJira');
+                break;
+            case "25":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersPuppetServer');
+                break;
+            case "26":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                callback(null, 'd4dModelMastersNexusServer');
+                break;
+        }
+    };
+
+    this.getCategoryFromID = function(id) {
+        logger.log('Entering getDBModelFromID');
+        switch (id.toString()) {
+            case "1":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('organization');
+                break;
+            case "2":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('businessgroups');
+                break;
+            case "3":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('environment');
+                break;
+            case "4":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('projects');
+                break;
+            case "5":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('organization');
+                break;
+            case "7":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('users');
+                break;
+            case "9":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('provider');
+                break;
+            case "10":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('chefserver');
+                break;
+            case "17":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('templates');
+                break;
+            case "18":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('dockerrepository');
+                break;
+            case "19":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('services');
+                break;
+            case "20":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('buildservers');
+                break;
+            case "21":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('teams');
+                break;
+            case "22":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('imagegallery');
+                break;
+            case "23":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('jiraserver');
+                break;
+            case "25":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('puppetserver');
+                break;
+            case "26":
+                logger.log('Exting getDBModelFromID ' + id.toString());
+                return ('nexusserver');
+                break;
+
+        };
+    };
+    this.getChefServerDetails_old = function(rowid, callback) {
+        d4dModel.findOne({
+            id: '10'
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.debug("Hit and error:" + err);
+            }
+            if (d4dMasterJson) {
+                var chefRepoPath = '';
+                var configmgmt = '';
+                var settings = chefSettings;
+                chefRepoPath = settings.chefReposLocation;
+                logger.debug("Repopath:" + chefRepoPath);
+
+                var hasOrg = false;
+                d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) {
+                    logger.debug("found" + itm.field.length);
+                    for (var j = 0; j < itm.field.length; j++) {
+                        if (itm.field[j]["name"] == 'rowid') {
+                            if (itm.field[j]["values"].value == rowid) {
+                                logger.debug("found: " + i + " -- " + itm.field[j]["values"].value);
+                                hasOrg = true;
+                                //Re-construct the json with the item found
+
+                                var orgname = '';
+                                var loginname = '';
+                                //looping to get the orgname , loginname
+                                for (var k = 0; k < itm.field.length; k++) {
+                                    if (itm.field[k]["name"].indexOf("login") >= 0)
+                                        loginname = itm.field[k]["values"].value + "/";
+                                    if (itm.field[k]["name"].indexOf("orgname") >= 0)
+                                        orgname = itm.field[k]["values"].value + "/";
+                                }
+
+                                for (var k = 0; k < itm.field.length; k++) {
+                                    if (itm.field[k]["name"].indexOf("filename") > 0) {
+                                        if (configmgmt == '')
+                                            configmgmt += "\"" + itm.field[k]["name"].replace('_filename', '') + "\":\"" + chefRepoPath + orgname + loginname + '.chef/' + itm.field[k]["values"].value + "\"";
+                                        else
+                                            configmgmt += ",\"" + itm.field[k]["name"].replace('_filename', '') + "\":\"" + chefRepoPath + orgname + loginname + '.chef/' + itm.field[k]["values"].value + "\"";
+
+                                    } else {
+                                        if (configmgmt == '')
+                                            configmgmt += "\"" + itm.field[k]["name"] + "\":\"" + itm.field[k]["values"].value + "\"";
+                                        else
+                                            configmgmt += ",\"" + itm.field[k]["name"] + "\":\"" + itm.field[k]["values"].value + "\"";
+                                    }
+                                }
+                                configmgmt += ",\"chefRepoLocation\":\"" + chefRepoPath + orgname + loginname + "\"";
+
+                                configmgmt = "{" + configmgmt + "}";
+                                configmgmt = JSON.parse(configmgmt);
+                                logger.debug(JSON.stringify(configmgmt));
+                            }
+                        }
+
+                        // logger.debug();
+                    }
+                }); // rows loop
+                callback(null, configmgmt);
+
+            } else {
+                callback(true, null);
+            }
+        });
+    };
+
+    this.getChefServerDetails = function(rowid, callback) {
+        var that = this;
+        this.getDBModelFromID("10", function(err, dbtype) {
+            if (err) {
+                logger.debug("Hit and error getChefServerDetails.getDBModelFromID:" + err);
+                callback(true, err);
+            }
+            if (dbtype) {
+                logger.debug("Master Type: " + dbtype + ' rowid : ' + rowid);
+                that.getRowids(function(err, rowidlist) {
+                    eval('d4dModelNew.' + dbtype).findOne({
+                        rowid: rowid
+                    }, function(err, d4dMasterJson) {
+                        if (err) {
+                            logger.debug("Hit and error @ getChefServerDetails:" + err);
+                        }
+                        var chefRepoPath = '';
+                        var configmgmt = '';
+                        var settings = chefSettings;
+
+                        chefRepoPath = settings.chefReposLocation;
+                        logger.debug("Repopath:" + chefRepoPath);
+
+                        var outJson = JSON.parse(JSON.stringify(d4dMasterJson));
+                        logger.debug('outJson:' + JSON.stringify(d4dMasterJson));
+                        if (outJson) {
+                            var keys = Object.keys(outJson);
+                            var orgname = '';
+                            var liveorgname = '';
+                            var loginname = '';
+                            for (i = 0; i < keys.length; i++) {
+                                var k = keys[i];
+                                if (keys[i].indexOf("login") >= 0)
+                                    loginname = outJson[k] + "/";
+                                if (keys[i].indexOf("orgname_rowid") >= 0) {
+                                    liveorgname = that.convertRowIDToValue(outJson[k], rowidlist);
+                                    orgname = outJson[k] + "/";
+                                }
+                            }
+                            if (loginname != '' && orgname != '') {
+                                for (i = 0; i < keys.length; i++) {
+                                    var k = keys[i];
+                                    if (keys[i].indexOf('_filename') > 0) {
+                                        keys[i] = keys[i].replace('_filename', '');
+                                        outJson[k] = chefRepoPath + orgname + loginname + '.chef/' + outJson[k];
+                                    }
+                                    if (configmgmt == '')
+                                        configmgmt = '\"' + keys[i] + '\":\"' + outJson[k] + '\"';
+                                    else
+                                        configmgmt += ',\"' + keys[i] + '\":\"' + outJson[k] + '\"';
+
+                                }
+                                if (configmgmt != '') {
+                                    configmgmt += ',\"chefRepoLocation\":\"' + chefRepoPath + orgname + loginname + '\"';
+                                    if (liveorgname != '') {
+                                        configmgmt += ',\"orgname_new\":\"' + liveorgname + '\"';
+                                    }
+                                }
+                            }
+                            callback(null, JSON.parse('{' + configmgmt + '}'));
+                            return;
+                        } else {
+                            callback(err, null);
+                            return;
+                        }
+                    });
+                }); //end getRowids
+            }
+        });
+    };
+
+    this.getPuppetServerDetails = function(rowid, callback) {
+        var that = this;
+        this.getDBModelFromID("25", function(err, dbtype) {
+            if (err) {
+                logger.debug("Hit and error getChefServerDetails.getDBModelFromID:" + err);
+                callback(true, err);
+            }
+            if (dbtype) {
+                logger.debug("Master Type: " + dbtype + ' rowid : ' + rowid);
+                that.getRowids(function(err, rowidlist) {
+                    eval('d4dModelNew.' + dbtype).findOne({
+                        rowid: rowid
+                    }, function(err, d4dMasterJson) {
+                        if (err) {
+                            logger.debug("Hit and error @ getChefServerDetails:" + err);
+                        }
+                        var chefRepoPath = '';
+                        var configmgmt = '';
+                        var settings = puppetSettings;
+
+                        chefRepoPath = settings.puppetReposLocation;
+                        logger.debug("Repopath:" + chefRepoPath);
+
+                        var outJson = JSON.parse(JSON.stringify(d4dMasterJson));
+                        logger.debug('outJson:' + JSON.stringify(d4dMasterJson));
+                        if (outJson) {
+                            var keys = Object.keys(outJson);
+                            var orgname = '';
+                            var liveorgname = '';
+                            var loginname = '';
+                            for (i = 0; i < keys.length; i++) {
+                                var k = keys[i];
+                                if (keys[i].indexOf("login") >= 0)
+                                    loginname = outJson[k] + "/";
+                                if (keys[i].indexOf("orgname_rowid") >= 0) {
+                                    liveorgname = that.convertRowIDToValue(outJson[k], rowidlist);
+                                    orgname = outJson[k] + "/";
+                                }
+                            }
+                            if (loginname != '' && orgname != '') {
+                                for (i = 0; i < keys.length; i++) {
+                                    var k = keys[i];
+                                    if (keys[i].indexOf('_filename') > 0) {
+                                        keys[i] = keys[i].replace('_filename', '');
+                                        outJson[k] = chefRepoPath + orgname + loginname + '.chef/' + outJson[k];
+                                    }
+                                    if (configmgmt == '')
+                                        configmgmt = '\"' + keys[i] + '\":\"' + outJson[k] + '\"';
+                                    else
+                                        configmgmt += ',\"' + keys[i] + '\":\"' + outJson[k] + '\"';
+
+                                }
+                                if (configmgmt != '') {
+                                    configmgmt += ',\"chefRepoLocation\":\"' + chefRepoPath + orgname + loginname + '\"';
+                                    if (liveorgname != '') {
+                                        configmgmt += ',\"orgname_new\":\"' + liveorgname + '\"';
+                                    }
+                                }
+                            }
+                            callback(null, JSON.parse('{' + configmgmt + '}'));
+                            return;
+                        } else {
+                            callback(err, null);
+                            return;
+                        }
+                    });
+                }); //end getRowids
+            }
+        });
+    };
+
+    this.getAccessFilesForRole__ = function(loginname, user, req, res, callback) {
+
+    };
+
+    this.getAccessFilesForRole = function(loginname, user, req, res, callback) {
+        logger.debug("Received Role name: " + loginname);
+        var accessibleFiles = [];
+        var mainRef = this;
+        var countOuter = 0;
+        var countInner = 0;
+        var countInnerInner = 0;
+        var roleslist = this.getListFilteredNew(7, "userrolename", "loginname", loginname, function(err, rolenames) {
+            if (rolenames) {
+                logger.debug("Rolenames for User:" + rolenames);
+                var rn = rolenames.replace(/\"/g, '').split(':')[0].split(',');
+
+                rn.forEach(function(rn1) {
+                    if (user.rolename == null || user.rolename == '')
+                        user.rolename = rn1;
+                    else
+                        user.rolename += ",&nbsp;" + rn1;
+
+                    logger.debug("Role " + countOuter + ":" + rn1);
+                    var permissionlist = mainRef.getListFilteredNew(6, "globalaccessname", "userrolename", rn1, function(err, globalaccessname) {
+
+                        logger.debug("inside globalaccessname : " + (globalaccessname == null));
+                        logger.debug("globalaccessname : " + globalaccessname.toString());
+                        var ga = globalaccessname.replace(/\"/g, '').split(':')[0].split(',');
+                        if (ga) {
+                            ga.forEach(function(ga1) {
+                                logger.debug('Access Type : ' + ga1);
+                                mainRef.getListFilteredNew(8, "files", "globalaccessname", ga1, function(err, jlt) {
+                                    countInner++;
+                                    logger.debug('inner loop ' + jlt);
+                                    //count++;
+                                    if (accessibleFiles.indexOf(jlt) < 0) {
+                                        jlt = jlt.split(':')[0];
+                                        accessibleFiles.push(jlt);
+                                    }
+                                    logger.debug(countOuter, rn.length, countInner, ga.length);
+                                    if (countOuter < rn.length) {
+
+                                    }
+                                    if (countInner == ga.length && countOuter < rn.length) {
+                                        countOuter++;
+                                        if (countOuter < rn.length) {
+                                            countInner = 0;
+                                        }
+
+                                    }
+                                    logger.debug(countOuter, rn.length, countInner, ga.length);
+                                    if (countOuter == rn.length && countInner == ga.length) {
+                                        callback(null, accessibleFiles.toString());
+
+                                    }
+                                });
+                            });
+                        }
+                    });
+
+                }); //end of foreach rn
+
+            } //end if(rolename)
+
+        }); //filter1
+        // callback(null,accessibleFiles.toString());
+    };
+
+    this.getAccessFilesForRole2 = function(loginname, req, res, callback) {
+        logger.debug("Received Role name: " + loginname);
+        var accessibleFiles = [];
+        var mainRef = this;
+        var countOuter = 0;
+        var roleslist = this.getListFilteredNew(7, "userrolename", "loginname", loginname, function(err, rolenames) {
+            if (rolenames) {
+                logger.debug("Rolenames for User:" + rolenames);
+                var rn = rolenames.replace(/\"/g, '').split(':')[0].split(',');
+                if (rn) {
+
+                    rn.forEach(function(rn1) {
+                        logger.debug("Role " + countOuter + ":" + rn1);
+                        countOuter++;
+                        var permissionlist = mainRef.getListFilteredNew(5, "globalaccessname", "userrolename", rn1, function(err, globalaccessname) {
+                            logger.debug("inside" + (globalaccessname == null));
+                            if (err) {
+                                logger.debug("Hit and error:" + err);
+                            }
+                            if (globalaccessname) {
+
+                                var ga = globalaccessname.replace(/\"/g, '').split(':')[0].split(',');
+                                if (ga) {
+                                    var count = 0;
+                                    ga.forEach(function(ga1) {
+                                        mainRef.getListFilteredNew(8, "files", "globalaccessname", ga1, function(err, jlt) {
+                                            logger.debug('inner loop ' + jlt);
+                                            count++;
+                                            if (accessibleFiles.indexOf(jlt) < 0) {
+                                                accessibleFiles.push(jlt);
+                                            }
+                                            if (count == ga.length) {
+                                                //callback(null,accessibleFiles.toString());
+                                            }
+                                        });
+                                    });
+
+                                }
+                            }
+                            if (countOuter == rn.length) {
+
+                            }
+                        });
+                    });
+
+                } else
+                    callback("err", null);
+                /* */
+
+            }
+        });
+        // callback(null,"HIT");
+    };
+    //Receiving the permission level for Role
+    this.getAccessFilesForRole1 = function(rolename, req, res, callback) {
+        logger.debug("Received Role name: " + rolename);
+        var accessibleFiles = [];
+        var mainRef = this;
+        var roleslist = this.getListFilteredNew(6, "globalaccessname", "userrolename", rolename, function(err, globalaccessname) {
+            if (err) {
+                logger.debug("Hit and error:" + err);
+            }
+            if (globalaccessname) {
+                var ga = globalaccessname.replace(/\"/g, '').split(':')[0].split(',');
+                if (ga) {
+                    var testing = function(ga, callback) {
+                        for (var k = 0; k < ga.length; k++) {
+                            logger.debug('Set Global Access : ' + ga[k]);
+
+
+                            var justlikethat = mainRef.getListFilteredNew(8, "files", "globalaccessname", ga[k], function(err, gafiles) {
+                                if (gafiles) {
+
+                                    var gaf = gafiles.split(',');
+                                    for (var l = 0; l < gaf.length; l++) {
+                                        if (accessibleFiles.indexOf(gaf[l]) < 0) {
+                                            accessibleFiles.push(gaf[l]);
+                                            logger.debug('File List for Global ' + accessibleFiles);
+
+                                        }
+                                    }
+                                }
+                            });
+
+                        }
+
+                    }
+
+                }
+            }
+        }); //end call back getlistfiltereed
+        logger.debug('Final :' + accessibleFiles);
+    };
+
+    this.getChefServerDetailsByChefServer = function(paramconfigname, callback) {
+
+        d4dModelNew.d4dModelMastersConfigManagement.findOne({
+            configname: paramconfigname,
+            id: 10
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.debug("Hit and error:" + err);
+            }
+            if (d4dMasterJson) {
+                var chefRepoPath = '';
+                var configmgmt = '';
+                var settings = chefSettings;
+                chefRepoPath = settings.chefReposLocation;
+                logger.debug("Repopath:" + chefRepoPath);
+                logger.debug("paramorgname :" + paramorgname);
+                var hasOrg = false;
+                var outJson = JSON.parse(JSON.stringify(d4dMasterJson));
+                logger.debug('outJson:' + JSON.stringify(d4dMasterJson));
+                var keys = Object.keys(outJson);
+                var orgname = outJson['orgname'];
+                var loginname = outJson['loginname'];
+                for (i = 0; i < keys.length; i++) {
+                    var k = keys[i];
+
+
+                    if (keys[i].indexOf("_filename") >= 0) {
+                        if (configmgmt == '')
+                            configmgmt += "\"" + keys[i].replace('_filename', '') + "\":\"" + chefRepoPath + orgname + '/' + loginname + '/.chef/' + outJson[k] + "\"";
+                        else
+                            configmgmt += ",\"" + keys[i].replace('_filename', '') + "\":\"" + chefRepoPath + orgname + '/' + loginname + '/.chef/' + outJson[k] + "\"";
+                    } else {
+                        if (configmgmt == '')
+                            configmgmt += "\"" + keys[i] + "\":\"" + outJson[k] + "\"";
+                        else
+                            configmgmt += ",\"" + keys[i] + "\":\"" + outJson[k] + "\"";
+                    }
+
+                }
+                configmgmt += ",\"chefRepoLocation\":\"" + chefRepoPath + orgname + '/' + loginname + "/\"";
+
+                configmgmt = "{" + configmgmt + "}";
+                logger.debug('Read Config:' + configmgmt);
+                callback(null, configmgmt);
+                return;
+
+
+            } else {
+                callback(true, null);
+            }
+        });
+    }
+
+    this.getChefServerDetailsByOrgname = function(paramorgname, callback) {
+
+
+
+        d4dModelNew.d4dModelMastersConfigManagement.findOne({
+            orgname_rowid: paramorgname,
+            id: 10
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.debug("Hit and error:" + err);
+            }
+            if (d4dMasterJson) {
+                var chefRepoPath = '';
+                var configmgmt = '';
+                var settings = chefSettings;
+                chefRepoPath = settings.chefReposLocation;
+                logger.debug("Repopath:" + chefRepoPath);
+                logger.debug("paramorgname :" + paramorgname);
+                var hasOrg = false;
+                var outJson = JSON.parse(JSON.stringify(d4dMasterJson));
+                logger.debug('outJson:' + JSON.stringify(d4dMasterJson));
+                var keys = Object.keys(outJson);
+                var orgname = outJson['orgname_rowid'];
+                var loginname = outJson['loginname'];
+                for (i = 0; i < keys.length; i++) {
+                    var k = keys[i];
+
+
+                    if (keys[i].indexOf("_filename") >= 0) {
+                        if (configmgmt == '')
+                            configmgmt += "\"" + keys[i].replace('_filename', '') + "\":\"" + chefRepoPath + orgname + '/' + loginname + '/.chef/' + outJson[k] + "\"";
+                        else
+                            configmgmt += ",\"" + keys[i].replace('_filename', '') + "\":\"" + chefRepoPath + orgname + '/' + loginname + '/.chef/' + outJson[k] + "\"";
+                    } else {
+                        if (configmgmt == '')
+                            configmgmt += "\"" + keys[i] + "\":\"" + outJson[k] + "\"";
+                        else
+                            configmgmt += ",\"" + keys[i] + "\":\"" + outJson[k] + "\"";
+                    }
+
+                }
+                configmgmt += ",\"chefRepoLocation\":\"" + chefRepoPath + orgname + '/' + loginname + "/\"";
+
+                configmgmt = "{" + configmgmt + "}";
+                logger.debug('Read Config:' + configmgmt);
+                callback(null, JSON.parse(configmgmt));
+                return;
+            } else {
+                callback(true, null);
+            }
+        });
+    }
+
+    this.getProvider = function(rowid, callback) {
+
+        d4dModel.findOne({
+            id: '9'
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.debug("Hit and error:" + err);
+            }
+            if (d4dMasterJson) {
+                var configmgmt = '';
+                var chefRepoPath = '';
+                var hasOrg = false;
+                d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) {
+                    logger.debug("found" + itm.field.length);
+                    for (var j = 0; j < itm.field.length; j++) {
+                        if (itm.field[j]["name"] == 'rowid') {
+                            if (itm.field[j]["values"].value == rowid) {
+                                logger.debug("found: " + i + " -- " + itm.field[j]["values"].value);
+                                hasOrg = true;
+                                //Re-construct the json with the item found
+                                var configmgmt = '';
+                                for (var k = 0; k < itm.field.length; k++) {
+
+                                    if (configmgmt == '')
+                                        configmgmt += "\"" + itm.field[k]["name"] + "\":\"" + itm.field[k]["values"].value + "\"";
+                                    else
+                                        configmgmt += ",\"" + itm.field[k]["name"] + "\":\"" + itm.field[k]["values"].value + "\"";
+
+                                }
+                                configmgmt = "{" + configmgmt + "}";
+                                logger.debug(JSON.stringify(configmgmt));
+
+                            }
+                        }
+                    }
+                }); // rows loop
+                callback(null, configmgmt);
+            }
+        });
+
+    };
+
+    this.getMasterRow = function(masterid, fieldname, fieldvalue, callback) {
+        logger.debug('In getMasterRow __ : ' + masterid + ' ' + fieldname + ' ' + fieldvalue);
+        if(fieldvalue == 'null' || fieldvalue == null)
+        {
+            logger.debug('hit..null');
+            callback(null, '');
+            return;
+        }
+        this.getDBModelFromID(masterid, function(err, dbtype) {
+            if (err) {
+                logger.debug("Hit and error getChefServerDetails.getDBModelFromID:" + err);
+                callback(true, err);
+            }
+            if (dbtype) {
+                logger.debug("Master Type: " + dbtype);
+                var query = {};
+                query[fieldname] = fieldvalue; //building the query 
+                query['id'] = masterid;
+                logger.debug('d4dModelNew.' + dbtype + '.findOne(' + JSON.stringify(query) + ')');
+                eval('d4dModelNew.' + dbtype).findOne(query, function(err, d4dMasterJson) {
+                    if (err) {
+                        logger.debug("Hit and error @ getChefServerDetails:" + err);
+                    }
+                    if (d4dMasterJson) {
+                        logger.debug('Before callback' + JSON.stringify(d4dMasterJson));
+                        callback(null, JSON.stringify(d4dMasterJson));
+                    } else
+                        callback(null, '');
+
+                });
+            } //end dbtype
+        }); //end get dbmodel
+    };
+
+    this.getList = function(masterid, fieldname, callback) {
+        var configmgmt = '';
+        d4dModel.findOne({
+            id: masterid
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.debug("Hit and error:" + err);
+                callback(err, null);
+                return;
+            }
+            if (d4dMasterJson) {
+                var jsonlist = '';
+                d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) {
+                    logger.debug("found" + itm.field.length);
+                    var rowid = '';
+                    var fieldvalue = '';
+                    for (var j = 0; j < itm.field.length; j++) {
+                        if (itm.field[j]["name"] == fieldname) {
+                            fieldvalue = itm.field[j]["values"].value;
+                        }
+                        if (itm.field[j]["name"] == "rowid") {
+                            rowid = itm.field[j]["values"].value;
+                        }
+                    }
+                    if (jsonlist == '')
+                        jsonlist += "{\"" + fieldvalue + "\":\"" + rowid + "\"}";
+                    else
+                        jsonlist += ",{\"" + fieldvalue + "\":\"" + rowid + "\"}";
+
+                });
+                configmgmt = "[" + jsonlist + "]";
+                logger.debug(JSON.stringify(configmgmt));
+                callback(null, JSON.parse(configmgmt));;
+            }
+        });
+    };
+    this.getProjectsForTeams = function(teamids, callback) {
+        logger.debug('rcvd teamids: ' + teamids);
+        var query = {};
+        teamids = teamids.split(',');
+        query['rowid'] = {
+            '$in': teamids
+        }
+        query['id'] = '21';
+        var projects = [];
+        d4dModelNew.d4dModelMastersTeams.find(query, function(err, teamjson) {
+            if (err) {
+                logger.error('d4dModelMastersTeams' + err);
+                callback(err, null);
+                return;
+            }
+            teamjson.forEach(function(k, v) {
+                if (k['projectname_rowid'].indexOf(',') > 0) {
+                    var projs = k['projectname_rowid'].split(',');
+                    for (var prj in projs) {
+                        if (projects.indexOf(projs) < 0)
+                            projects.push(projs);
+                    }
+                } else {
+                    if (projects.indexOf(k['projectname_rowid']) < 0)
+                        projects.push(k['projectname_rowid']);
+                }
+                if (v >= teamjson.length - 1) {
+                    logger.debug('teamjson', JSON.stringify(projects));
+                    callback(null, projects);
+                }
+            });
+
+        });
+    };
+
+    this.getProjectsForOrgs = function(orgId, callback) {
+        d4dModelNew.d4dModelMastersProjects.find({
+            orgname_rowid: orgId,
+            id: "4"
+        }, function(err, data) {
+            if (err) {
+                callback(err, null);
+            }
+            callback(null, data);
+        });
+    };
+    this.convertRowIDToValue = function(rowid, rowidcont) {
+        var toreturn = '';
+        var jobj = JSON.parse(JSON.stringify(rowidcont));
+        for (var k1 in jobj) {
+            //if any key has _rowid then update corresponding field
+            for (var k2 in jobj[k1]) {
+                if (k2 == rowid)
+                    toreturn = jobj[k1][k2];
+            }
+
+        }
+        logger.debug('returned convertRowIDToValue', toreturn, rowid);
+        return (toreturn);
+    };
+
+    this.getRowids = function(callback) {
+        var rowidval = [];
+        logger.debug('getRowids in');
+        d4dModelNew.d4dModelMastersOrg.find({
+            id: "1"
+        }, function(err, orgdata) {
+            if (orgdata) {
+                var orgdata_ = JSON.parse(JSON.stringify(orgdata));
+                orgdata_.forEach(function(k, v) {
+                    var rid = {};
+                    rid[k['rowid']] = k['orgname'];
+                    rowidval.push(rid);
+                });
+
+            }
+            logger.debug('finised orgdata' + JSON.stringify(rowidval));
+            d4dModelNew.d4dModelMastersProductGroup.find({
+                id: "2"
+            }, function(err, bgdata) {
+                if (bgdata) {
+                    var bgdata_ = JSON.parse(JSON.stringify(bgdata));
+                    bgdata_.forEach(function(k, v) {
+                        var rid = {};
+                        rid[k['rowid']] = k['productgroupname'];
+                        rowidval.push(rid);
+                    });
+
+                }
+                d4dModelNew.d4dModelMastersProjects.find({
+                    id: "4"
+                }, function(err, prjdata) {
+                    if (prjdata) {
+                        var prjdata_ = JSON.parse(JSON.stringify(prjdata));
+                        prjdata_.forEach(function(k, v) {
+                            var rid = {};
+                            rid[k['rowid']] = k['projectname'];
+                            rowidval.push(rid);
+                        });
+
+                    }
+                    d4dModelNew.d4dModelMastersConfigManagement.find({
+                        id: "10"
+                    }, function(err, cfgdata) {
+                        if (cfgdata) {
+                            var cfgdata_ = JSON.parse(JSON.stringify(cfgdata));
+                            cfgdata_.forEach(function(k, v) {
+                                var rid = {};
+                                rid[k['rowid']] = k['configname'];
+                                rowidval.push(rid);
+                            });
+
+                        }
+                        d4dModelNew.d4dModelMastersEnvironments.find({
+                            id: "3"
+                        }, function(err, envdata) {
+                            if (envdata) {
+
+                                var envdata_ = JSON.parse(JSON.stringify(envdata));
+                                if (envdata_.length <= 0) {
+                                    logger.debug('rowidval' + JSON.stringify(rowidval));
+                                    callback(null, rowidval);
+                                    return;
+                                }
+
+                                envdata_.forEach(function(k, v) {
+                                    var rid = {};
+                                    rid[k['rowid']] = k['environmentname'];
+                                    rowidval.push(rid);
+                                });
+                            }
+
+                            d4dModelNew.d4dModelMastersUsers.find({
+                                id: "7"
+                            }, function(err, userdata) {
+                                if (userdata) {
+                                    var userdata_ = JSON.parse(JSON.stringify(userdata));
+                                    if (userdata_.length <= 0) {
+                                        logger.debug('rowidval' + JSON.stringify(rowidval));
+                                        callback(null, rowidval);
+                                        return;
+                                    }
+
+                                    userdata_.forEach(function(k, v) {
+                                        var rid = {};
+                                        rid[k['rowid']] = k['loginname'];
+                                        rowidval.push(rid);
+                                    });
+                                }
+
+                                d4dModelNew.d4dModelMastersTeams.find({
+                                    id: "21"
+                                }, function(err, teamdata) {
+                                    if (teamdata) {
+                                        var teamdata_ = JSON.parse(JSON.stringify(teamdata));
+                                        if (teamdata_.length <= 0) {
+                                            logger.debug('rowidval' + JSON.stringify(rowidval));
+                                            callback(null, rowidval);
+                                            return;
+                                        }
+                                        var i = 0;
+                                        teamdata_.forEach(function(k, v) {
+                                            var rid = {};
+                                            rid[k['rowid']] = k['teamname'];
+                                            rowidval.push(rid);
+                                        });
+
+                                        logger.debug("End of Team.");
+                                        callback(null, rowidval);
+                                        return;
+                                    } else {
+                                        logger.debug("Else in Team.");
+                                        callback(null, rowidval);
+                                        return;
+                                    }
+                                }); //teams
+
+                            }); //userdata 
+                        }); //env
+                    }); //config management
+                }); // proj
+            }); //bg
+        }); //org
+    };
+
+
+    this.getListNew = function(mastername, fieldname, callback) {
+        logger.debug(mastername);
+        this.getDBModelFromID(mastername, function(err, dbtype) {
+            if (err) {
+                logger.debug("Hit and error:" + err);
+            }
+            if (dbtype) {
+                var query = {};
+                query['id'] = mastername;
+
+                logger.debug("Master Type: " + dbtype);
+                eval('d4dModelNew.' + dbtype).find(query, function(err, d4dMasterJson) {
+                    if (err) {
+                        logger.debug("Hit and error:" + err);
+                    }
+                    var d4d = JSON.parse(JSON.stringify(d4dMasterJson));
+                    var jsonlist = '';
+                    d4d.forEach(function(k, v) {
+                        var ke = Object.keys(k);
+                        logger.debug(k[fieldname], k['rowid'], v);
+                        if (jsonlist == '')
+                            jsonlist += "{\"" + k[fieldname] + "\":\"" + k['rowid'] + "\"}";
+                        else
+                            jsonlist += ",{\"" + k[fieldname] + "\":\"" + k['rowid'] + "\"}";
+
+                    });
+                    configmgmt = "[" + jsonlist + "]";
+                    logger.debug("sent response" + JSON.stringify(configmgmt));
+                    callback(null, configmgmt);
+
+                });
+            }
+        });
+    };
+
+    this.getListFiltered = function(masterid, fieldname, comparedfieldname, comparedfieldvalue, callback) {
+        d4dModel.findOne({
+            id: masterid
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.debug("Hit and error:" + err);
+            }
+            if (d4dMasterJson) {
+                var jsonlist = '';
+                d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) {
+                    var rowid = '';
+                    var fieldvalue = '';
+                    var isFilteredRow = false;
+                    //filtering for the correct rows
+                    for (var j = 0; j < itm.field.length; j++) {
+                        if (itm.field[j]["name"] == comparedfieldname) {
+                            if (itm.field[j]["values"].value == comparedfieldvalue) {
+                                logger.debug("In Field [ " + itm.field[j]["name"] + "]" + itm.field[j]["values"].value);
+                                isFilteredRow = true;
+
+                            }
+                        }
+                    }
+                    if (isFilteredRow) {
+                        for (var j = 0; j < itm.field.length; j++) {
+                            if (itm.field[j]["name"] == fieldname) {
+                                fieldvalue = itm.field[j]["values"].value;
+                            }
+                            if (itm.field[j]["name"] == "rowid") {
+                                rowid = itm.field[j]["values"].value;
+                            }
+                        }
+                        if (jsonlist == '')
+                            jsonlist += "\"" + fieldvalue + "\":\"" + rowid + "\"";
+                        else
+                            jsonlist += ",\"" + fieldvalue + "\":\"" + rowid + "\"";
+                    }
+
+                });
+                configmgmt = "{" + jsonlist + "}";
+                logger.debug(JSON.stringify(jsonlist));
+                callback(null, jsonlist);
+                return (jsonlist);
+            }
+        });
+    };
+
+    this.getListFilteredNew = function(mastername, fieldname, comparedfieldname, comparedfieldvalue, callback) {
+        logger.debug(mastername);
+        this.getDBModelFromID(mastername, function(err, dbtype) {
+            if (err) {
+                logger.debug("Hit and error:" + err);
+            }
+            if (dbtype) {
+                var query = {};
+                query[comparedfieldname] = comparedfieldvalue; //building the query 
+                query['id'] = mastername;
+
+                logger.debug("Master Type: " + dbtype);
+                eval('d4dModelNew.' + dbtype).find(query, function(err, d4dMasterJson) {
+                    if (err) {
+                        logger.debug("Hit and error:" + err);
+                    }
+                    var d4d = JSON.parse(JSON.stringify(d4dMasterJson));
+                    var jsonlist = '';
+                    d4d.forEach(function(k, v) {
+                        var ke = Object.keys(k);
+                        logger.debug(ke.length + ' ' + k[fieldname]);
+                        if (jsonlist == '')
+                            jsonlist += "\"" + k[fieldname] + "\":\"" + k['rowid'] + "\"";
+                        else
+                            jsonlist += ",\"" + k[fieldname] + "\":\"" + k['rowid'] + "\"";
+                    });
+                    configmgmt = "{" + jsonlist + "}";
+                    logger.debug("sent response" + JSON.stringify(configmgmt));
+                    callback(null, jsonlist);
+
+                });
+            }
+        });
+    };
+
+    this.getCodeList = function(name, callback) {
+        if (codelist) {
+            var count = 0;
+            var list = '';
+            logger.debug('Code List Items length: ' + codelist.length);
+            codelist.forEach(function(k, v) {
+                logger.debug("Code items: ", k.name, "Values", k.values.length);
+                if (k.name == name) {
+                    for (var i = 0; i < k.values.length; i++) {
+                        if (list == '') {
+                            list = k.values[i];
+                        } else
+                            list += ',' + k.values[i];
+
+                        logger.debug(k.values[i]);
+                    }
+                }
+                count++;
+                if (count >= codelist.length) {
+                    logger.debug('reached callback');
+                    callback(null, list);
+                }
+            });
+        }
+    };
+
+    this.deactivateOrg = function(orgid, action, callback) {
+        logger.debug("Orgid:" + orgid + ' action: ' + action);
+        d4dModelNew.d4dModelMastersGeneric.update({
+            $or: [{
+                orgname_rowid: orgid
+            }, {
+                rowid: orgid
+            }]
+        }, {
+            $set: {
+                active: action
+            }
+        }, {
+            upsert: false,
+            multi: true
+        }, function(err, data) {
+            if (err) {
+                logger.debug(err);
+                callback(err, null);
+                return;
+            }
+            logger.debug('Deactivated ' + orgid + ' in masters. Count: ' + data);
+            callback(null, "done");
+            return;
+        });
+    };
+
+    this.deleteCheck = function(rowid, formids, fieldname, callback) {
+        logger.debug("Delete Check request rcvd." + rowid + ' : ' + formids.toString() + ' : ' + fieldname);
+        var count = 0;
+        var exitloop = false;
+        //Building dynamic schema
+        var checkmasters = function(rowid, formids, fieldname) {
+            var delcheckquery = {};
+            delcheckquery.id = {
+                $in: formids
+            };
+            if (fieldname.indexOf(',') > 0) {
+                var fldn = fieldname.split(',');
+                for (flds in fldn) {
+                    delcheckquery[flds] = {
+                        $regex: ".*" + rowid + "*"
+                    };
+                }
+            } else
+                delcheckquery[fieldname] = {
+                    $regex: ".*" + rowid + "*"
+                };
+            d4dModelNew.d4dModelMastersGeneric.find(delcheckquery, function(err, d4dMasterJson) {
+                if (!err) {
+                    logger.debug(JSON.stringify(d4dMasterJson));
+                    if (d4dMasterJson.length > 0) {
+                        logger.debug('Found in ' + d4dMasterJson[0]['id'] + ' returning : ');
+                        callback(null, 'found');
+                        return;
+                    } else {
+                        callback(null, 'none');
+                        return;
+                    }
+
+                } else {
+                    logger.debug("Hit an error in deleteCheck:" + err);
+                    callback(err, null);
+                    return;
+                }
+
+            });
+        };
+        var checkBPInstances = function(rowid, tempplatescheck) {
+            blueprintdao.getBlueprintsByProjectId(rowid, function(err, data) {
+                if (!err) {
+                    logger.debug(JSON.stringify(data));
+                    if (data.length > 0) {
+                        logger.debug('Found in ' + data['name'] + ' returning : ');
+                        callback(null, 'found blueprints');
+                        return;
+                    } else {
+                        if (formids.indexOf('instances') < 0 && formids.indexOf('all') < 0) {
+                            callback(null, 'none');
+                            return;
+                        } else {
+                            instancedao.getInstanceByProjectId(rowid, function(err, data) {
+                                if (!err) {
+                                    if (data.length > 0) {
+                                        logger.debug('Found in ' + data['chefNodeName'] + ' returning : ');
+                                        callback(null, 'found instances');
+                                        return;
+                                    } else {
+                                        if (tempplatescheck != null) {
+                                            var ids = [];
+                                            ids.push('17');
+                                            ids.push('19');
+
+                                            checkmasters(rowid, ids, 'configname_rowid');
+                                        } else {
+                                            callback(null, 'none');
+                                            return;
+                                        }
+                                    }
+                                } else {
+                                    logger.debug("Hit an error in deleteCheck getInstanceByProjectId:" + err);
+                                    callback(err, null);
+                                    return;
+                                }
+                            });
+                        }
+                    }
+                } else {
+                    logger.debug("Hit an error in deleteCheck getBlueprintsByProjectId:" + err);
+                    callback(err, null);
+                    return;
+                }
+            });
+        };
+
+        if (formids.indexOf('blueprints') < 0 && formids.indexOf('instances') < 0 && formids.indexOf('all') < 0) {
+
+            checkmasters(rowid, formids, fieldname);
+        } else {
+            if (formids.indexOf('blueprints') >= 0) {
+
+                checkBPInstances(rowid, null);
+            } else if (formids.indexOf('all') >= 0) {
+                logger.debug('Entering all');
+                checkBPInstances(rowid, "checktemplates");
+            }
+        }
+    };
+
+    this.getServiceFromId = function(serviceId, callback) {
+        this.getDBModelFromID('19', function(err, dbtype) {
+            if (err) {
+                callback(err, null);
+                return;
+            }
+            if (dbtype) {
+                var query = {};
+                query['rowid'] = {
+                    '$in': [serviceId]
+                }
+                query['id'] = '19';
+
+                logger.debug("Master Type: " + dbtype);
+                eval('d4dModelNew.' + dbtype).find(query, function(err, d4dMasterJson) {
+                    if (err) {
+                        callback(err, null);
+                        return;
+                    }
+                    callback(null, d4dMasterJson);
+                });
+            } else {
+                callback({
+                    "msg": "Invalid DBTYPE"
+                }, null);
+            }
+        });
+    };
+
+    this.getJenkinsDataFromId = function(serverId, callback) {
+        this.getDBModelFromID('20', function(err, dbtype) {
+            if (err) {
+                callback(err, null);
+                return;
+            }
+            if (dbtype) {
+                var query = {};
+                query['rowid'] = {
+                    '$in': [serverId]
+                }
+                query['id'] = '20';
+
+                logger.debug("Master Type: " + dbtype);
+                eval('d4dModelNew.' + dbtype).find(query, function(err, d4dMasterJson) {
+                    if (err) {
+                        callback(err, null);
+                        return;
+                    }
+                    callback(null, d4dMasterJson);
+                });
+            } else {
+                callback({
+                    "msg": "Invalid DBTYPE"
+                }, null);
+            }
+        });
+    };
+
+
+    this.getEnvNameFromEnvId = function(envId, callback) {
+        var self = this;
+        this.getRowids(function(err, rowidlist) {
+            if (err) {
+                callback(err, null);
+                return;
+            } else {
+                var envName = self.convertRowIDToValue(envId, rowidlist)
+                logger.debug(envName);
+                callback(null, envName);
+            }
+        });
+    };
+
+    this.getOrgBgProjEnvNameFromIds = function(orgId, bgId, projId, envId, callback) {
+        var self = this;
+        this.getRowids(function(err, rowidlist) {
+            if (err) {
+                callback(err, null);
+                return;
+            } else {
+                var names = {};
+
+                names.envName = self.convertRowIDToValue(envId, rowidlist);
+                names.orgName = self.convertRowIDToValue(orgId, rowidlist);
+                names.bgName = self.convertRowIDToValue(bgId, rowidlist);
+                names.projName = self.convertRowIDToValue(projId, rowidlist);
+
+                logger.debug(names);
+                callback(null, names);
+            }
+        });
+    };
+
+    this.getTeamsOrgBuProjForUser = function(username, callback) {
+        logger.debug('Entering getTeamsOrgBuProjForUser');
+        var outJ = [];
+        var query = {};
+        query['loginname'] = username;
+        query['id'] = '7';
+        d4dModelNew.d4dModelMastersUsers.find(query, function(err, userd) {
+            if (err) {
+                logger.debug('Exiting with err 1336 getTeamsOrgBuProjForUser');
+                callback(err, null);
+                return;
+            }
+            if (userd) {
+                //Get teams for user
+                logger.debug('In getTeamsOrgBuProjForUser userd :' + JSON.stringify(userd[0]));
+                outJ.push({
+                    userid: userd[0]['rowid'],
+                    teams: [],
+                    orgs: [],
+                    projects: [],
+                    bunits: [],
+                });
+                var qry = {};
+                qry['id'] = '21';
+                qry['loginname_rowid'] = userd[0]['rowid'];
+                d4dModelNew.d4dModelMastersTeams.find({
+                    id: "21",
+                    loginname_rowid: {
+                        $regex: userd[0]['rowid']
+                    }
+                }, function(err, teamd) {
+                    if (err) {
+                        logger.debug('Exiting with err 1359 getTeamsOrgBuProjForUser');
+                        callback(err, null);
+                        return;
+                    }
+                    if (teamd.length > 0) {
+                        teamd.forEach(function(k, v) {
+                            if (typeof k['projectname_rowid'] != "undefined") {
+                                outJ[0].teams.push(k['rowid']);
+                                var projs = k['projectname_rowid'].split(',');
+                                for (var i = 0; i < projs.length; i++) {
+
+                                    if (outJ[0].projects.indexOf(projs[i]) < 0) {
+                                        outJ[0].projects.push(projs[i]);
+
+                                    }
+                                    if (v >= teamd.length - 1 && i >= (projs.length - 1)) {
+                                        //All projects added.
+                                        var qry1 = {};
+                                        qry1['id'] = '4';
+                                        if (userd[0]['userrolename'] != 'Admin')
+                                            qry1['rowid'] = {
+                                                $in: outJ[0].projects
+                                            };
+
+                                        d4dModelNew.d4dModelMastersProjects.find(qry1, function(err, projd) {
+                                            if (err) {
+                                                logger.debug('Exiting with err 1386 getTeamsOrgBuProjForUser');
+                                                callback(err, null);
+                                                return;
+                                            }
+                                            logger.debug("No Projects..... ", JSON.stringify(projd));
+                                            if (projd.length > 0) {
+                                                for (var j = 0; j < projd.length; j++) {
+                                                    var orglist = projd[j]['orgname_rowid'];
+                                                    var bulist = projd[j]['productgroupname_rowid'].split(',');
+                                                    for (var k = 0; k < orglist.length; k++) {
+                                                        if (outJ[0]['orgs'].indexOf(orglist[k]) < 0)
+                                                            outJ[0]['orgs'].push(orglist[k]);
+                                                    }
+                                                    for (var k = 0; k < bulist.length; k++) {
+                                                        if (outJ[0]['bunits'].indexOf(bulist[k]) < 0)
+                                                            outJ[0]['bunits'].push(bulist[k]);
+                                                    }
+                                                    if (j >= projd.length - 1) {
+                                                        logger.debug('Came to the last project');
+                                                        logger.debug('Exiting getTeamsOrgBuProjForUser');
+                                                        callback(null, outJ);
+                                                    }
+                                                }
+
+                                            } else {
+                                                logger.debug('Exiting with err 1411 getTeamsOrgBuProjForUser');
+                                                callback(null, outJ);
+                                                return;
+                                            }
+                                        });
+                                    }
+                                }
+                            } else {
+                                logger.debug("Return proj value: ", outJ);
+                                callback(null, outJ);
+                                return;
+                            }
+                        });
+                    } else {
+                        callback(null, outJ);
+                        return;
+                    }
+                });
+            } else {
+                callback(null, outJ);
+            }
+        }); //d4dModelMastersUsers
+    };
+
+}
+
+module.exports = new Configmgmt();
diff --git a/server/app/model/d4dmasters/d4dmastersmodelnew.js b/server/app/model/d4dmasters/d4dmastersmodelnew.js
index 762554f86..ddd2a9d4d 100755
--- a/server/app/model/d4dmasters/d4dmastersmodelnew.js
+++ b/server/app/model/d4dmasters/d4dmastersmodelnew.js
@@ -939,6 +939,163 @@ var d4dMastersJenkinsConfig = new mongoose.Schema({
 });
 var d4dModelJenkinsConfig = mongoose.model('d4dModelJenkinsConfig', d4dMastersJenkinsConfig, 'd4dmastersnew');
 
+
+var d4dMastersBitbucketConfig = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    bitbucketname: {
+        type: String,
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    bitbucketurl: {
+        type: String,
+        required: false,
+        trim: true
+    },
+    bitbucketusername: {
+        type: String,
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    bitbucketpassword: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    orgname: {
+        type: [String],
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelBitbucketConfig = mongoose.model('d4dModelBitbucketConfig', d4dMastersBitbucketConfig, 'd4dmastersnew');
+
+var d4dMastersFunctionalTestConfig = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    functionaltestname: {
+        type: String,
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    functionaltesturl: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    functionaltestdays: {
+        type: String,
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname: {
+        type: [String],
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelFunctionalTestConfig = mongoose.model('d4dModelFunctionalTestConfig', d4dMastersFunctionalTestConfig, 'd4dmastersnew');
+
+
+var d4dMastersOctopusConfig = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    octopusname: {
+        type: String,
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    octopusurl: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    octopuskey: {
+        type: String,
+        required: true,
+        trim: true
+       
+    },
+    
+    orgname: {
+        type: [String],
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelOctopusConfig = mongoose.model('d4dModelOctopusConfig', d4dMastersOctopusConfig, 'd4dmastersnew');
+
+
+
+
+
+
 var d4dMastersProviders = new mongoose.Schema({
     id: {
         type: String,
@@ -1126,20 +1283,35 @@ var d4dMastersJira = new mongoose.Schema({
         type: String,
         required: true,
         trim: true
+    },    
+    orgname: {
+        type: [String],
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
     },
     jiraname: {
         type: String,
-        required: true,
+       // required: true,
         trim: true
     },
     jirausername: {
         type: String,
-        required: true,
+     
         trim: true
     },
     jirapassword: {
         type: String,
-        required: true,
+       
+        trim: true
+    },
+    jirakey: {
+        type: String,
+       
         trim: true
     },
     jiraurl: {
@@ -1321,3 +1493,7 @@ module.exports.d4dModelMastersImages = d4dModelMastersImages;
 module.exports.d4dModelMastersJira = d4dModelMastersJira;
 module.exports.d4dModelMastersPuppetServer = d4dModelMastersPuppetServer;
 module.exports.d4dModelMastersNexusServer = d4dModelMastersNexusServer;
+module.exports.d4dModelBitbucketConfig = d4dModelBitbucketConfig;
+module.exports.d4dModelOctopusConfig = d4dModelOctopusConfig;
+module.exports.d4dModelFunctionalTestConfig = d4dModelFunctionalTestConfig;
+
diff --git a/server/app/model/d4dmasters/d4dmastersmodelnew.js.bak b/server/app/model/d4dmasters/d4dmastersmodelnew.js.bak
new file mode 100644
index 000000000..762554f86
--- /dev/null
+++ b/server/app/model/d4dmasters/d4dmastersmodelnew.js.bak
@@ -0,0 +1,1323 @@
+/*
+ Copyright [2016] [Relevance Lab]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+
+// This file act as a Model class which contains all Settings schema.
+
+var mongoose = require('mongoose');
+var uuid = require('node-uuid'); //used for generating unique id
+var validate = require('mongoose-validator');
+var logger = require('_pr/logger')(module);
+var extend = require('mongoose-validator').extend;
+var Schema = mongoose.Schema;
+
+extend('is_ValidName', function(val) {
+    var pattern = /^[a-zA-Z0-9-_]+$/;
+    return pattern.test(val);
+}, 'Name can contain alphabets, numbers,dash, underscore');
+
+extend('isValidDesc', function(val) {
+    var pattern = /^[a-zA-Z0-9-_.,\s]+$/;
+    return pattern.test(val);
+}, 'Name can contain alphabets, numbers,dash, underscore');
+
+var nameValidator = [
+    validate({
+        validator: 'isLength',
+        arguments: [1, 15],
+        message: 'Name should be between 1 and 15 characters'
+    }),
+    validate({
+        validator: 'is_ValidName',
+        passIfEmpty: true,
+        message: 'Name can contain alphabets, numbers,dash, underscore, dot'
+    })
+];
+
+var descValidator = [
+    validate({
+        validator: 'isLength',
+        arguments: [0, 140],
+        message: 'Name should be between 0 and 140 characters'
+    }),
+    validate({
+        validator: 'isValidDesc',
+        passIfEmpty: true,
+        message: 'Name can contain alphabets, numbers,dash, underscore, dot or a space'
+    })
+];
+
+var d4dMastersSchemaNew = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    name: {
+        type: String,
+        trim: true
+    },
+    masterjson: {
+        data: Object
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelNew = mongoose.model('d4dMasterNew', d4dMastersSchemaNew, 'd4dmastersnew');
+
+var d4dMastersOrg = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    name: {
+        type: String,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname: {
+        type: String,
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    domainname: {
+        type: String,
+        trim: true
+    },
+    description: {
+        type: String,
+        trim: true
+    },
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersOrg = mongoose.model('d4dModelMastersOrg', d4dMastersOrg, 'd4dmastersnew');
+
+
+
+
+var d4dMastersProductGroup = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    name: {
+        type: String,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname: {
+        type: [String],
+        required: true,
+        trim: true
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    productgroupname: {
+        type: String,
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    description: {
+        type: String,
+        trim: true,
+        validate: descValidator
+    },
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersProductGroup = mongoose.model('d4dModelMastersProductGroup', d4dMastersProductGroup, 'd4dmastersnew');
+
+
+var d4dMastersEnvironments = new mongoose.Schema({
+    id: {
+        type: String,
+        trim: true
+    },
+    name: {
+        type: String,
+        trim: true
+    },
+    orgname: {
+        type: [String],
+        required: false,
+        trim: true
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    environmentname: {
+        type: String,
+        trim: true
+    },
+    puppetenvironmentname: {
+        type: String
+    },
+    description: {
+        type: String,
+        trim: true,
+        validate: descValidator
+    },
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    configname: {
+        type: String,
+        trim: true
+    },
+    configname_rowid: {
+        type: String,
+        trim: true
+    },
+    puppetservername: {
+        type: String,
+        trim: true
+    },
+    puppetservername_rowid: {
+        type: String,
+        trim: true
+    },
+    projectname: {
+        type: String,
+        trim: true
+    },
+    projectname_rowid: {
+        type: String,
+        trim: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersEnvironments = mongoose.model('d4dModelMastersEnvironments', d4dMastersEnvironments, 'd4dmastersnew');
+
+var d4dMastersGeneric = new mongoose.Schema({
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    orgname: {
+        type: [String],
+        trim: true
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersGeneric = mongoose.model('d4dModelMastersGeneric', d4dMastersGeneric, 'd4dmastersnew');
+
+var d4dMastersDynamic = new mongoose.Schema({
+    active: {
+        type: Boolean
+    },
+    id: {
+        type: String
+    },
+    rowid: {
+        type: String
+    }
+}, {
+    strict: false
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersDynamic = mongoose.model('d4dModelMastersDynamic', d4dMastersDynamic, 'd4dmastersnew');
+
+var d4dMastersTeams = new mongoose.Schema({
+    id: {
+        type: String,
+        trim: true
+    },
+    teamname: {
+        type: String,
+        trim: true
+    },
+    loginname: {
+        type: String,
+        trim: true
+    },
+    loginname_rowid: {
+        type: String,
+        trim: true
+    },
+    projectname: {
+        type: String,
+        trim: true
+    },
+    projectname_rowid: {
+        type: String,
+        trim: true
+    },
+    orgname: {
+        type: [String],
+        required: false,
+        trim: true
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    description: {
+        type: String,
+        trim: true,
+        validate: descValidator
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersTeams = mongoose.model('d4dModelMastersTeams', d4dMastersTeams, 'd4dmastersnew');
+
+var d4dMastersProjects = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    name: {
+        type: String,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname: {
+        type: [String],
+        required: false,
+        trim: true
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    projectname: {
+        type: String,
+        trim: true,
+        validate: nameValidator
+    },
+    productgroupname: {
+        type: String,
+        trim: true
+    },
+    productgroupname_rowid: {
+        type: String,
+        trim: true
+    },
+    environmentname: {
+        type: String,
+        trim: true
+    },
+    environmentname_rowid: {
+        type: String,
+        trim: true
+    },
+    description: {
+        type: String,
+        trim: true,
+        validate: descValidator
+    },
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    appdeploy: [{
+        applicationname: String,
+        appdescription: String
+    }],
+    repositories: {
+        nexus: [String],
+        docker: [String]
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersProjects = mongoose.model('d4dModelMastersProjects', d4dMastersProjects, 'd4dmastersnew');
+
+var d4dMastersConfigManagement = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    name: {
+        type: String,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname: {
+        type: [String],
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    orgrowid: {
+        type: String,
+        trim: true
+    },
+    configname: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    loginname: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    url: {
+        type: String,
+        trim: true
+    },
+    userpemfile_filename: {
+        type: String,
+        trim: true
+    },
+    validatorpemfile_filename: {
+        type: String,
+        trim: true
+    },
+    kniferbfile_filename: {
+        type: String,
+        trim: true
+    },
+    encryption_filename: {
+        type: String,
+        trim: true
+    },
+    template_filename: {
+        type: String,
+        trim: true
+    },
+    folderpath: {
+        type: String,
+        trim: true
+    },
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    configType: {
+        type: String,
+        trim: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersConfigManagement = mongoose.model('d4dModelMastersConfigManagement', d4dMastersConfigManagement, 'd4dmastersnew');
+
+var d4dMastersDockerConfig = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    name: {
+        type: String,
+        trim: true,
+        validate: nameValidator
+    },
+    dockerreponame: {
+        type: String,
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    dockerrepopath: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    dockeruserid: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    dockeremailid: {
+        type: String,
+        trim: true
+    },
+    dockerpassword: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    orgname: {
+        type: [String],
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    folderpath: {
+        type: String,
+        trim: true
+    },
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    configType: {
+        type: String,
+        trim: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersDockerConfig = mongoose.model('d4dModelMastersDockerConfig', d4dMastersDockerConfig, 'd4dmastersnew');
+
+
+var d4dMastersUsers = new mongoose.Schema({
+    id: {
+        type: String,
+        trim: true
+    },
+    loginname: {
+        type: String,
+        trim: true,
+        validate: nameValidator
+    },
+    password: {
+        type: String
+    },
+    email: {
+        type: String,
+        trim: true
+    },
+    userrolename: {
+        type: String,
+        trim: true
+    },
+    orgname: {
+        type: [String],
+        required: false,
+        trim: true
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    teamname: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    teamname_rowid: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersUsers = mongoose.model('d4dModelMastersUsers', d4dMastersUsers, 'd4dmastersnew');
+
+var d4dMastersUserroles = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    userrolename: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    description: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    globalaccessname: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    orgname: {
+        type: [String],
+        required: false,
+        trim: true
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersUserroles = mongoose.model('d4dModelMastersUserroles', d4dMastersUserroles, 'd4dmastersnew');
+
+
+
+var d4dMastersDesignTemplateTypes = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    name: {
+        type: String,
+        trim: true
+    },
+    templatetypename: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    designtemplateicon_filename: {
+        type: String,
+        trim: true
+    },
+    orgname: {
+        type: [String],
+        required: false,
+        trim: true
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    templatetype: {
+        type: String,
+        trim: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersDesignTemplateTypes = mongoose.model('d4dModelMastersDesignTemplateTypes', d4dMastersDesignTemplateTypes, 'd4dmastersnew');
+
+var d4dMastersTemplatesList = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    name: {
+        type: String,
+        trim: true
+    },
+    templatename: {
+        type: String,
+        trim: true
+    },
+    templatesicon_filename: {
+        type: String,
+        trim: true
+    },
+    templatetypename: {
+        type: String,
+        trim: true
+    },
+    dockerreponame: {
+        type: String,
+        trim: true
+    },
+    configname: {
+        type: String,
+        trim: true
+    },
+    configname_rowid: {
+        type: String,
+        trim: true
+    },
+    dockercontainerpathstitle: {
+        type: String,
+        trim: true
+    },
+    dockercontainerpaths: {
+        type: String,
+        trim: true
+    },
+    templatescookbooks: {
+        type: String,
+        trim: true
+    },
+    orgname: {
+        type: [String],
+        required: false,
+        trim: true
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    template_filename: {
+        type: String,
+        trim: true
+    },
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersTemplatesList = mongoose.model('d4dModelMastersTemplatesList', d4dMastersTemplatesList, 'd4dmastersnew');
+
+
+var d4dMastersServicecommands = new mongoose.Schema({
+    id: {
+        type: String,
+        trim: true
+    },
+    name: {
+        type: String,
+        trim: true
+    },
+    servicename: {
+        type: String,
+        trim: true,
+        validate: nameValidator
+    },
+    commandname: {
+        type: String,
+        trim: true
+    },
+    commandtype: {
+        type: String,
+        trim: true
+    },
+    configname: {
+        type: String,
+        trim: true
+    },
+    configname_rowid: {
+        type: String,
+        trim: true
+    },
+    chefserverid: {
+        type: String,
+        trim: true
+    },
+    operatingsystem: {
+        type: String,
+        trim: true
+    },
+    servicecookbook: {
+        type: String,
+        trim: true
+    },
+    servicestart: {
+        type: String,
+        trim: true
+    },
+    servicestop: {
+        type: String,
+        trim: true
+    },
+    servicerestart: {
+        type: String,
+        trim: true
+    },
+    servicestatus: {
+        type: String,
+        trim: true
+    },
+    servicekill: {
+        type: String,
+        trim: true
+    },
+    command: {
+        type: String,
+        trim: true
+    },
+    commandaction: {
+        type: String,
+        trim: true
+    },
+    orgname: {
+        type: [String],
+        required: false,
+        trim: true
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersServicecommands = mongoose.model('d4dModelMastersServicecommands', d4dMastersServicecommands, 'd4dmastersnew');
+
+var d4dMastersglobalaccess = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    globalaccessname: {
+        type: String,
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    files: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersglobalaccess = mongoose.model('d4dModelMastersglobalaccess', d4dMastersglobalaccess, 'd4dmastersnew');
+
+var d4dMastersJenkinsConfig = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    jenkinsname: {
+        type: String,
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    jenkinsurl: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    jenkinsusername: {
+        type: String,
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    jenkinspassword: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    jenkinstokenfile_filename: {
+        type: String,
+        trim: true
+    },
+    orgname: {
+        type: [String],
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    folderpath: {
+        type: String,
+        trim: true
+    },
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelJenkinsConfig = mongoose.model('d4dModelJenkinsConfig', d4dMastersJenkinsConfig, 'd4dmastersnew');
+
+var d4dMastersProviders = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    providername: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    region: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    accesskey: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    secretkey: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    providertype: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    securitygroupids: {
+        type: [String],
+        required: true,
+        trim: true
+    },
+    instanceUserName: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    providerpemfile_filename: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    folderpath: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersProviders = mongoose.model('d4dModelMastersProviders', d4dMastersProviders, 'd4dmastersnew');
+
+var d4dMastersProvidersOpenStack = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    providername: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    openstackusername: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    openstackpassword: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    region: {
+        type: String,
+        required: false,
+        trim: true
+    },
+    accesskey: {
+        type: String,
+        required: false,
+        trim: true
+    },
+    secretkey: {
+        type: String,
+        required: false,
+        trim: true
+    },
+    providertype: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    securitygroupids: {
+        type: [String],
+        required: false,
+        trim: true
+    },
+    instanceUserName: {
+        type: String,
+        required: false,
+        trim: true
+    },
+    providerpemfile_filename: {
+        type: String,
+        required: false,
+        trim: true
+    },
+    folderpath: {
+        type: String,
+        required: false,
+        trim: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersProvidersOpenStack = mongoose.model('d4dModelMastersProvidersOpenStack', d4dMastersProviders, 'd4dmastersnew');
+
+var d4dMastersImages = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    imagename: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    imageidentifire: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    osusername: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    ostype: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    instancetypes: {
+        type: [String],
+        required: true,
+        trim: true
+    },
+    providername: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    providername_rowid: {
+        type: String,
+        trim: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersImages = mongoose.model('d4dModelMastersImages', d4dMastersImages, 'd4dmastersnew');
+
+var d4dMastersJira = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    jiraname: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    jirausername: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    jirapassword: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    jiraurl: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersJira = mongoose.model('d4dModelMastersJira', d4dMastersJira, 'd4dmastersnew');
+
+var d4dMastersPuppetServer = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    name: {
+        type: String,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname: {
+        type: [String],
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    orgrowid: {
+        type: String,
+        trim: true
+    },
+    puppetservername: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    username: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    puppetpassword: {
+        type: String,
+        trim: true
+    },
+    userpemfile_filename: {
+        type: String,
+        trim: true
+    },
+    folderpath: {
+        type: String,
+        trim: true
+    },
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    configType: {
+        type: String,
+        trim: true
+    },
+    hostname: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersPuppetServer = mongoose.model('d4dModelMastersPuppetServer', d4dMastersPuppetServer, 'd4dmastersnew');
+
+
+var d4dMastersNexusServer = new mongoose.Schema({
+    id: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    name: {
+        type: String,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname: {
+        type: [String],
+        required: true,
+        trim: true,
+        validate: nameValidator
+    },
+    orgname_rowid: {
+        type: [String],
+        trim: true
+    },
+    orgrowid: {
+        type: String,
+        trim: true
+    },
+    nexusservername: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    username: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    nexuspassword: {
+        type: String,
+        trim: true
+    },
+    configType: {
+        type: String,
+        trim: true
+    },
+    hostname: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    groupid: {
+        type: [String],
+        required: false,
+        trim: true
+    },
+    active: {
+        type: Boolean,
+        trim: true,
+        default: true
+    },
+    rowid: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    collection: 'd4dmastersnew'
+});
+var d4dModelMastersNexusServer = mongoose.model('d4dModelMastersNexusServer', d4dMastersNexusServer, 'd4dmastersnew');
+
+
+module.exports = d4dModelNew;
+module.exports.d4dModelMastersOrg = d4dModelMastersOrg;
+module.exports.d4dModelMastersProductGroup = d4dModelMastersProductGroup;
+module.exports.d4dModelMastersEnvironments = d4dModelMastersEnvironments;
+module.exports.d4dModelMastersProjects = d4dModelMastersProjects;
+module.exports.d4dModelMastersConfigManagement = d4dModelMastersConfigManagement;
+module.exports.d4dModelMastersDockerConfig = d4dModelMastersDockerConfig;
+module.exports.d4dModelMastersDesignTemplateTypes = d4dModelMastersDesignTemplateTypes;
+module.exports.d4dModelMastersTemplatesList = d4dModelMastersTemplatesList;
+module.exports.d4dModelMastersServicecommands = d4dModelMastersServicecommands;
+module.exports.d4dModelMastersUsers = d4dModelMastersUsers;
+module.exports.d4dModelMastersTeams = d4dModelMastersTeams;
+module.exports.d4dModelMastersUserroles = d4dModelMastersUserroles;
+module.exports.d4dModelMastersglobalaccess = d4dModelMastersglobalaccess;
+module.exports.d4dModelJenkinsConfig = d4dModelJenkinsConfig; //
+module.exports.d4dModelMastersGeneric = d4dModelMastersGeneric;
+module.exports.d4dModelMastersDynamic = d4dModelMastersDynamic;
+module.exports.d4dModelMastersProviders = d4dModelMastersProviders;
+module.exports.d4dModelMastersProvidersOpenStack = d4dModelMastersProvidersOpenStack;
+module.exports.d4dModelMastersImages = d4dModelMastersImages;
+module.exports.d4dModelMastersJira = d4dModelMastersJira;
+module.exports.d4dModelMastersPuppetServer = d4dModelMastersPuppetServer;
+module.exports.d4dModelMastersNexusServer = d4dModelMastersNexusServer;
diff --git a/server/app/routes/v1.0/routes.js b/server/app/routes/v1.0/routes.js
index 17795beba..c2fe38521 100755
--- a/server/app/routes/v1.0/routes.js
+++ b/server/app/routes/v1.0/routes.js
@@ -25,6 +25,7 @@ var auth = require('./routes_authentication');
 var chef = require('./routes_chef.js');
 var users = require('./routes_users');
 var d4dMasters = require('./routes_d4dMasters');
+var d4dMastersCICD = require('./routes_d4dMastersCICD');
 var organizations = require('./routes_organizations');
 var projects = require('./routes_projects');
 var blueprints = require('./routes_blueprints');
@@ -83,7 +84,8 @@ module.exports.setRoutes = function(app) {
     var adminSessionVerificationFunc = verificationFunctions.adminSessionVerificationFunc;
 
     d4dMasters.setRoutes(app, sessionVerificationFunc);
-
+    d4dMastersCICD.setRoutes(app);
+    
     organizations.setRoutes(app, sessionVerificationFunc);
 
     projects.setRoutes(app, sessionVerificationFunc);
diff --git a/server/app/routes/v1.0/routes.js.bak b/server/app/routes/v1.0/routes.js.bak
new file mode 100644
index 000000000..17795beba
--- /dev/null
+++ b/server/app/routes/v1.0/routes.js.bak
@@ -0,0 +1,252 @@
+/*
+ Copyright [2016] [Relevance Lab]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+
+// This file act as a request mapping i.e. it will decide which request will go to which routes.
+
+
+var logger = require('_pr/logger')(module);
+var express = require("express");
+var path = require("path");
+var auth = require('./routes_authentication');
+var chef = require('./routes_chef.js');
+var users = require('./routes_users');
+var d4dMasters = require('./routes_d4dMasters');
+var organizations = require('./routes_organizations');
+var projects = require('./routes_projects');
+var blueprints = require('./routes_blueprints');
+var instances = require('./routes_instances');
+var tasks = require('./routes_tasks');
+var taskStatus = require('./routes_taskstatus');
+var ec2 = require('./routes_aws_ec2');
+var jenkins = require('./routes_jenkins');
+var openstack = require('./routes_openstack');
+var hppubliccloud = require('./routes_hppubliccloud');
+var azure = require('./routes_azure');
+var application = require('./routes_application');
+var jira = require('./routes_jira');
+var provider = require('./routes_provider');
+var providerCommon = require('./routes_providercommon');
+var vmimage = require('./routes_vmImages');
+var chefClientExecution = require('./routes_chefClientExecutionResponse');
+var appConfig = require('_pr/config');
+var cloudformation = require('./routes_cloudformation');
+var notification = require('./routes_notification');
+var globalsettings = require('./routes_globalsettings');
+var tracks = require('./routes_track');
+var trackType = require('./routes_trackType');
+var puppet = require('./routes_puppet.js');
+var appdeploy = require('./routes_appdeploy');
+var nexus = require('./routes_nexus');
+var vmware = require('./routes_vmware.js');
+var servicenow = require('./routes_servicenow');
+var appdeployPipeline = require('./routes_appdeployPipeline');
+var chefFactory = require('./routes_cheffactory');
+var expressServeStatic = require('serve-static');
+var arm = require('./routes_arm');
+var dashboardProvider = require('./routes_dashboard');
+var appData = require('./routes_appdata');
+var deployPermission = require('./routes_deploypermission');
+var trackedInstances = require('./routes_trackedInstances');
+var resources = require('./routes_resources');
+var serviceStatus = require('./routes_serviceStatus');
+var compositeBlueprints = require('./routes_compositeBlueprints');
+var blueprintFrames = require('./routes_blueprintFrames');
+var cors = require('cors');
+var auditTrail = require('./routes_audit_trails');
+var scripts = require('./routes_scripts');
+var fileUpload = require('./routes_fileUpload');
+/*
+ * @TODO
+ * Change app to router in internal routes files
+ */
+
+module.exports.setRoutes = function(app) {
+
+    app.use(cors());
+
+    var verificationFunctions = auth.setRoutes(app);
+    var sessionVerificationFunc = verificationFunctions.sessionVerificationFunc;
+    var adminSessionVerificationFunc = verificationFunctions.adminSessionVerificationFunc;
+
+    d4dMasters.setRoutes(app, sessionVerificationFunc);
+
+    organizations.setRoutes(app, sessionVerificationFunc);
+
+    projects.setRoutes(app, sessionVerificationFunc);
+
+    blueprints.setRoutes(app, sessionVerificationFunc);
+
+    instances.setRoutes(app, sessionVerificationFunc);
+
+    chef.setRoutes(app, sessionVerificationFunc);
+
+    users.setRoutes(app, sessionVerificationFunc);
+
+    tasks.setRoutes(app, sessionVerificationFunc);
+
+    taskStatus.setRoutes(app, sessionVerificationFunc);
+
+    ec2.setRoutes(app, sessionVerificationFunc);
+
+    jenkins.setRoutes(app, sessionVerificationFunc);
+
+    openstack.setRoutes(app, sessionVerificationFunc);
+
+    hppubliccloud.setRoutes(app, sessionVerificationFunc);
+
+    azure.setRoutes(app, sessionVerificationFunc);
+
+    vmware.setRoutes(app, sessionVerificationFunc);
+
+    application.setRoutes(app, sessionVerificationFunc);
+
+    jira.setRoutes(app, sessionVerificationFunc);
+
+    provider.setRoutes(app, sessionVerificationFunc);
+    providerCommon.setRoutes(app, sessionVerificationFunc);
+
+    vmimage.setRoutes(app, sessionVerificationFunc);
+
+    chefClientExecution.setRoutes(app);
+
+    cloudformation.setRoutes(app, sessionVerificationFunc);
+
+    globalsettings.setRoutes(app, sessionVerificationFunc);
+
+    tracks.setRoutes(app, sessionVerificationFunc);
+
+    trackType.setRoutes(app, sessionVerificationFunc);
+
+    puppet.setRoutes(app, sessionVerificationFunc);
+
+    appdeploy.setRoutes(app, sessionVerificationFunc);
+
+    nexus.setRoutes(app, sessionVerificationFunc);
+
+    servicenow.setRoutes(app, sessionVerificationFunc);
+
+    appdeployPipeline.setRoutes(app, sessionVerificationFunc);
+
+    chefFactory.setRoutes(app, sessionVerificationFunc);
+
+    dashboardProvider.setRoutes(app, sessionVerificationFunc);
+
+    arm.setRoutes(app, sessionVerificationFunc);
+
+    dashboardProvider.setRoutes(app, sessionVerificationFunc);
+
+    appData.setRoutes(app, sessionVerificationFunc);
+
+    deployPermission.setRoutes(app, sessionVerificationFunc);
+
+    trackedInstances.setRoutes(app, sessionVerificationFunc);
+
+    resources.setRoutes(app, sessionVerificationFunc);
+
+    serviceStatus.setRoutes(app, sessionVerificationFunc);
+
+    auditTrail.setRoutes(app, sessionVerificationFunc);
+
+    compositeBlueprints.setRoutes(app, sessionVerificationFunc);
+
+    blueprintFrames.setRoutes(app, sessionVerificationFunc);
+
+    scripts.setRoutes(app, sessionVerificationFunc);
+
+    fileUpload.setRoutes(app, sessionVerificationFunc);
+
+
+    app.get('/', function(req, res) {
+        res.redirect('/cat3');
+    });
+
+    //for public html files
+    app.use('/public', expressServeStatic(path.join(path.dirname(path.dirname(path.dirname(path.dirname(__dirname)))), 'client/htmls/public')));
+    app.use('/cat3', expressServeStatic(path.join(path.dirname(path.dirname(path.dirname(path.dirname(__dirname)))), 'client/cat3')));
+
+    app.get('/public/login.html', function(req, res, next) {
+        if (req.session && req.session.user) {
+            res.redirect('/');
+        } else {
+            next();
+        }
+    });
+
+    // for private html files
+    app.all('/private/*', function(req, res, next) {
+        if (req.session && req.session.user) {
+            if (req.session.user.authorizedfiles) {
+                var authfiles = req.session.user.authorizedfiles.split(','); //To be moved to login page an hold a static variable.
+                authfiles += ',index.html,settings.html,design.html,Tracker.html,noaccess.html'
+                if (req.originalUrl.indexOf('.html') > 0) //its a html file.
+                {
+                    var urlpart = req.originalUrl.split('/');
+                    if (authfiles.indexOf(urlpart[urlpart.length - 1]) < 0 && req.session.user.cn != 'sd1') {
+                        logger.debug('not authorized');
+                    } else {
+                        logger.debug('Authorized');
+                    }
+
+                }
+            }
+            logger.debug('req received ' + req.originalUrl);
+            next();
+        } else {
+            res.redirect('/public/login.html');
+        }
+    });
+    app.use('/private', expressServeStatic(path.join(path.dirname(path.dirname(path.dirname(path.dirname(__dirname)))), 'client/htmls/private')));
+    app.use('/cat3', expressServeStatic(path.join(path.dirname(path.dirname(path.dirname(path.dirname(__dirname)))), 'client/cat3')));
+
+
+    // for upload dir
+    if (appConfig.staticUploadDir) {
+        app.all('/uploads/*', function(req, res, next) {
+            if (req.session && req.session.user) {
+                next();
+            } else {
+                res.send(403);
+
+            }
+        });
+
+        app.use('/uploads', expressServeStatic(appConfig.staticUploadDir));
+    }
+    // for notification
+    notification.setRoutes(app);
+
+    app.use(errorHandler);
+
+    function errorHandler(err, req, res, next) {
+        if(err) {
+            logger.error(err);
+
+            var errorResponse = {
+                'status': err.status,
+                'message': err.message,
+                'errors': []
+            };
+            if ('errors' in err) {
+                for(var i = 0; i < err.errors.length; i++) {
+                    if('message' in err.errors[i])
+                        errorResponse.errors.push(err.errors[i].messages);
+                }
+            }
+            return res.status(err.status).send(errorResponse);
+        }
+    }
+}
\ No newline at end of file
diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js
index f4a2f1dee..9cfa2fe0a 100755
--- a/server/app/routes/v1.0/routes_d4dMasters.js
+++ b/server/app/routes/v1.0/routes_d4dMasters.js
@@ -742,7 +742,49 @@ module.exports.setRoutes = function(app, sessionVerification) {
                             return;
                         });
 
-                    } else if (req.params.id === '6') {
+                    } else if (req.params.id === '27') {
+                        // For Jenkins
+                        masterUtil.getBitbucket(orgList, function(err, bitbucketList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Bitbucket.');
+                            }
+                            res.send(bitbucketList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '28') {
+                        // For Octopus
+                        masterUtil.getOctopus(orgList, function(err, octopusList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Octopus.');
+                            }
+                            res.send(octopusList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '29') {
+                        // For Octopus
+                        masterUtil.getFunctionalTest(orgList, function(err, functionaltestlist) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Functional Tests.');
+                            }
+                            res.send(functionaltestlist);
+                            return;
+                        });
+
+                    }else if (req.params.id === '23') {
+                        // For Jira
+                        logger.debug("Entering getJira");
+                        masterUtil.getJira(orgList, function(err, jiraList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Jira.');
+                            }
+                            res.send(jiraList);
+                            return;
+                        });
+
+                    } 
+                    else if (req.params.id === '6') {
                         // For User Role
                         masterUtil.getUserRoles(function(err, userRoleList) {
                             if (err) {
@@ -898,7 +940,47 @@ module.exports.setRoutes = function(app, sessionVerification) {
                             return;
                         });
 
-                    } else if (req.params.id === '6') {
+                    } else if (req.params.id === '27') {
+                        // For Bitbucket
+                        masterUtil.getBitbucket(orgList, function(err, bitbucketList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch bitbucket.');
+                            }
+                            res.send(bitbucketList);
+                            return;
+                        });
+
+                    }else if (req.params.id === '28') {
+                        // For Octopus
+                        masterUtil.getOctopus(orgList, function(err, octopusList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Octopus.');
+                            }
+                            res.send(octopusList);
+                            return;
+                        });
+
+                    }else if (req.params.id === '29') {
+                        // For Octopus
+                        masterUtil.getFunctionalTest(orgList, function(err, functionaltestlist) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Functional Tests.');
+                            }
+                            res.send(functionaltestlist);
+                            return;
+                        });
+
+                    }else if (req.params.id === '23') {
+                        // For Jira
+                        masterUtil.getJira(orgList, function(err, jiraList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Jira.');
+                            }
+                            res.send(jiraList);
+                            return;
+                        });
+
+                    }else if (req.params.id === '6') {
                         // For User Role
                         masterUtil.getUserRoles(function(err, userRoleList) {
                             if (err) {
diff --git a/server/app/routes/v1.0/routes_d4dMasters.js.bak b/server/app/routes/v1.0/routes_d4dMasters.js.bak
new file mode 100644
index 000000000..f4a2f1dee
--- /dev/null
+++ b/server/app/routes/v1.0/routes_d4dMasters.js.bak
@@ -0,0 +1,3551 @@
+/*
+ Copyright [2016] [Relevance Lab]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+
+// This file act as a Controller which contains Settings related all end points.
+
+var d4dModel = require('_pr/model/d4dmasters/d4dmastersmodel.js');
+var d4dModelNew = require('_pr/model/d4dmasters/d4dmastersmodelnew.js');
+var usersDao = require('_pr/model/users.js');
+var fileIo = require('_pr/lib/utils/fileio');
+var uuid = require('node-uuid');
+var configmgmtDao = require('_pr/model/d4dmasters/configmgmt.js');
+var Chef = require('_pr/lib/chef');
+var Curl = require('_pr/lib/utils/curl.js');
+var appConfig = require('_pr/config');
+var logger = require('_pr/logger')(module);
+var childProcess = require('child_process');
+var exec = childProcess.exec;
+var masterUtil = require('_pr/lib/utils/masterUtil.js');
+var blueprintsDao = require('_pr/model/dao/blueprints');
+var errorResponses = require('./error_responses.js');
+var bcrypt = require('bcryptjs');
+var authUtil = require('_pr/lib/utils/authUtil.js');
+var Cryptography = require('_pr/lib/utils/cryptography');
+var Client = require('node-rest-client').Client;
+var cryptoConfig = appConfig.cryptoSettings;
+var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password);
+var waitForPort = require('wait-for-port');
+var parser = require('xml2json');
+var util = require('util');
+var Task = require('_pr/model/classes/tasks/tasks.js');
+var async = require('async');
+var	appDeployPipelineService = require('_pr/services/appDeployPipelineService');
+var	settingsService = require('_pr/services/settingsService');
+
+
+module.exports.setRoutes = function(app, sessionVerification) {
+
+    app.all('/d4dMasters/*', sessionVerification);
+
+    // New implementation for docker authentication: Relevance Lab
+    app.post('/d4dmasters/docker/validate_old', function(req, res) {
+        logger.debug("Docker credentials: ", JSON.stringify(req.body));
+
+        // dockerHubAPI.login(req.body.userName, req.body.password,function(info){
+        //     logger.debug('Info:',info);
+        //     res.send('200');
+        // });
+        // var options_auth = {
+        //     user: req.body.username,
+        //     password: req.body.password
+        // }
+        // client = new Client();
+        // var dockerUrl = 'https://index.docker.io/v1/user';
+        // var reqSubmit = client.get(dockerUrl,options_auth,function(info,data){
+        //     console.log(info.toString());
+        //     res.send('200');
+        // });
+
+        var curl = new Curl();
+        curl.executecurl('curl --raw -L --user ' + req.body.username + ':' + req.body.password + ' https://index.docker.io/v1/users', function(err, resp) {
+            var loggedin = false;
+            if (!err) {
+                if (resp.indexOf('OK') > 0) {
+                    loggedin = true;
+                    logger.debug('in ok' + resp);
+                    res.status('200').send('{message:"success"}');
+                    return;
+                } else {
+                    logger.debug('In else -- ' + resp);
+                    res.end('403');
+                    return;
+                }
+
+            } else {
+                logger.debug('In 1 else -- ' + resp);
+                res.end('405');
+                return;
+            }
+        });
+
+        // var userName = req.body.userName;
+        // var password = req.body.password;
+
+        // var options_auth = {
+        //     user: userName,
+        //     password: password
+        // };
+        // client = new Client(options_auth);
+        // var dockerUrl = 'https://index.docker.io/api/v1.1/users';
+        // var reqSubmit = client.get(dockerUrl,function(data, response){
+        //     logger.debug("data: ", data.toString());
+        // });
+
+        //client.registerMethod("jsonMethod", dockerUrl, "GET");
+        // var reqSubmit = client.methods.jsonMethod(function(data, response) {
+        //   logger.debug("response: ", response.statusCode);
+        //  //   logger.debug("data: ", data.toString());
+        //     res.send('200');
+        //     return;
+        // });
+
+        // Handling Exception for nexus req.
+        // reqSubmit.on('error', function(err) {
+        //     logger.debug('Something went wrong on req!!', err.request.options);
+        //     res.send('402');
+        // });
+    });
+
+    app.post('/d4dmasters/docker/validate', function(req, res) {
+        logger.debug("Docker crudentials: ", JSON.stringify(req.body));
+        var userName = req.body.userName;
+        var password = req.body.password;
+
+        var options_auth = {
+            user: userName,
+            password: password
+        };
+        client = new Client(options_auth);
+        var dockerUrl = 'https://index.docker.io/v1/users';
+        client.registerMethod("jsonMethod", dockerUrl, "GET");
+        var reqSubmit = client.methods.jsonMethod(function(data, response) {
+            logger.debug("response: ", response);
+            logger.debug("data: ", JSON.stringify(data));
+            res.send('200');
+            return;
+        });
+
+        // Handling Exception for nexus req.
+        reqSubmit.on('error', function(err) {
+            logger.debug('Something went wrong on req!!', err.request.options);
+            res.send('402');
+        });
+    });
+
+
+    // Used npm library instead of curl to check ip is alive or not: Relevance Lab
+    app.get('/d4dmasters/instanceping/:ip', function(req, res) {
+        logger.debug("Enter get() for /d4dmasters/instanceping/%s", req.params.ip);
+        // make sure 22 port should be open for all instances.
+        waitForPort(req.params.ip, 22, function(err) {
+            if (err) {
+                logger.error("Error to ping ip: ", err);
+                res.status(500).send('Not Alive');
+                return;
+            }
+            res.send('Alive');
+        });
+    });
+    //d4dmasters/getdockertags/centos/null
+    app.get('/d4dmasters/getdockertags/:repopath/:dockerreponame', function(req, res) {
+        logger.debug("Enter get() for /d4dmasters/getdockertags/%s/%s", req.params.repopath, req.params.dockerreponame);
+        //fetch the username and password from
+        //Need to populate dockerrowid in template card. - done
+        logger.debug('hit getdockertags');
+        configmgmtDao.getMasterRow(18, 'dockerreponame', req.params.dockerreponame, function(err, data) {
+            if (!err) {
+                logger.debug('data rcvd:' + data == '');
+                logger.debug(data);
+                var dockerRepo = null;
+                var options_auth = null;
+                if (data != '') {
+                    dockerRepo = JSON.parse(data);
+                    logger.debug("Docker Repo ->%s", JSON.stringify(dockerRepo));
+                    var userName = dockerRepo.dockeruserid;
+                    var password = dockerRepo.dockerpassword;
+                    options_auth = {
+                        user: userName,
+                        password: password
+                    };
+                    client = new Client(options_auth);
+                } else {
+                    client = new Client();
+                }
+                logger.debug("Docker Repopath ->%s", req.params.repopath);
+
+                // Tried with http rest call but api did not working from docker side, so commenting and keeping old code: Gobinda
+
+
+                var dockerUrl = 'https://registry.hub.docker.com/v1/repositories/' + req.params.repopath.replace(/\$\$/g, '/') + '/tags';
+                //https://index.docker.io/v1/repositories/
+                logger.debug('dockerurl:' + dockerUrl);
+                client.registerMethod("jsonMethod", dockerUrl, "GET");
+                var reqSubmit = client.methods.jsonMethod(function(data, response) {
+                    console.log("response: ", data);
+                    res.send(JSON.stringify(data));
+                    return;
+                });
+
+                // Handling Exception for nexus req.
+                reqSubmit.on('error', function(err) {
+                    logger.debug('Something went wrong on req!!', err, err.request.options);
+                    res.send('402');
+                });
+
+                // end rest call
+
+            } else {
+                logger.error("Error:", err);
+                res.end(err);
+            }
+        });
+    });
+
+
+    app.get('/d4dMasters/mastersjson', function(req, res) {
+        logger.debug("Enter get() for /d4dMasters/mastersjson");
+        res.send([{
+            name: 'master'
+        }, {
+            name: 'master2'
+        }]);
+        logger.debug("Exit get() for /d4dMasters/mastersjson");
+    });
+    //getAccessFilesForRole
+    app.get('/d4dMasters/getaccessroles/:loginname', function(req, res) {
+        logger.debug("Enter get() for /d4dMasters/getaccessroles/%s", req.params.loginname);
+        var authorizedFiles = req.session.user.authorizedfiles;
+        var loggedInUser = req.params.loginname;
+        configmgmtDao.getAccessFilesForRole(loggedInUser, req, res, function(err, getAccessFiles) {
+            if (getAccessFiles) {
+                getAccessFiles = getAccessFiles.replace(/\"/g, '').replace(/\:/g, '')
+                logger.debug("Rcvd in call: %s", getAccessFiles);
+                authorizedFiles = getAccessFiles;
+                res.end(authorizedFiles);
+            }
+        });
+        logger.debug("Exit get() for /d4dMasters/getaccessroles/%s", req.params.loginname);
+    });
+
+    app.get('/d4dMasters/getcodelist/:name', function(req, res) {
+        logger.debug("Enter get() for /d4dMasters/getcodelist/%s", req.params.name);
+        configmgmtDao.getCodeList(req.params.name, function(err, cl) {
+            if (cl) {
+                logger.debug("Closing");
+                res.end(cl);
+            }
+        });
+        logger.debug("Exit get() for /d4dMasters/getcodelist/%s", req.params.name);
+    });
+
+    app.get('/d4dMasters/getuser', function(req, res) {
+        logger.debug("Enter get() for /d4dMasters/getuser : " + JSON.stringify(req.session.user));
+        res.send({
+            "user": [{
+                username: req.session.user
+            }, {
+                role: '[' + req.session.user.roleId + ']'
+            }]
+        });
+        logger.debug("Exit get() for /d4dMasters/getuser");
+    });
+
+    // Get the current loggedin user details with permissionset and authorized files
+    app.get('/d4dMasters/loggedin/user', function(req, res) {
+        if (req.session.user) {
+            var pSet = req.session.user.permissionset;
+            if (pSet.length > 1) {
+                var pSetList = [];
+                for (var i = 0; i < pSet.length; i++) {
+                    if (pSet[i].rolename === "Admin") {
+                        req.session.user.permissionset = pSet[i];
+                        res.send(req.session.user);
+                        return;
+                    } else {
+                        pSetList.push(pSet[i]);
+                    }
+                }
+                req.session.user.permissionset = pSetList;
+                res.send(req.session.user);
+                return;
+            } else {
+                res.send(req.session.user);
+                return;
+            }
+        } else {
+            res.status(404).send({
+                "errorCode": 404,
+                "message": "User not found in session."
+            });
+            return;
+        }
+    });
+
+
+    app.get('/d4dMasters/authorizedfiles', function(req, res) {
+        logger.debug("Enter get() for /d4dMasters/authorizedfiles");
+        res.send('[' + req.session.user.authorizedfiles + ']');
+        logger.debug("Exit get() for /d4dMasters/authorizedfiles");
+    });
+
+    app.get('/d4dMasters/setting', function(req, res) {
+        configmgmtDao.getTeamsOrgBuProjForUser(req.session.user.cn, function(err, data) {
+            logger.debug('Retuened setting : ' + data);
+            res.send(200);
+        });
+    });
+
+    app.get('/d4dMasters/removeitem/:id/:fieldname/:fieldvalue', function(req, res) {
+        logger.debug("Received request for delete chk. %s : %s : %s", req.params.fieldvalue, req.params.id, req.params.fieldname);
+        // logger.debug('received request ' + req.params.id);
+        logger.debug('Verifying User permission set for delete.');
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID(req.params.id);
+        var permissionto = 'delete';
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
+            if (err) {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                }
+                if (anUser) {
+                    var tocheck = [];
+                    var fieldname = '';
+                    switch (req.params.id) {
+                        case "1":
+                            tocheck.push('2');
+                            tocheck.push('3');
+                            tocheck.push('10');
+                            fieldname = "orgname_rowid";
+                            break;
+                        case "2":
+                            tocheck.push('4');
+                            fieldname = "productgroupname_rowid";
+                            break;
+                        case "3":
+                            tocheck.push('4');
+                            fieldname = "environmentname_rowid,orgname_rowid";
+                            break;
+                        case "4":
+                            tocheck.push('blueprints');
+                            tocheck.push('instances');
+                            fieldname = "projectId";
+                            break;
+                        case "10":
+                            tocheck.push('all');
+                            fieldname = "configname_rowid";
+                            break;
+                        case "19":
+                            tocheck.push('blueprints');
+                            tocheck.push('instances');
+                            fieldname = "projectId";
+                            break;
+                    }
+
+                    masterUtil.getTemplateTypesById(req.params.fieldvalue, function(err, templateTypeData) {
+                        if (err) {
+                            res.status(500).send("Error from DB");
+                            return;
+                        }
+                        if (templateTypeData.length > 0) {
+                            blueprintsDao.getBlueprintByTemplateType(templateTypeData[0].templatetypename, function(err, bpData) {
+                                if (err) {
+                                    res.status(500).send("Error from DB.");
+                                    return;
+                                }
+                                configmgmtDao.deleteCheck(req.params.fieldvalue, tocheck, fieldname, function(err, data) {
+                                    logger.debug("Delete check returned: %s", data);
+                                    if (data == "none") {
+                                        logger.debug("entering delete");
+                                        configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) {
+                                            if (err) {
+                                                logger.debug("Hit and error:", err);
+                                            }
+                                            if (dbtype) {
+                                                var item = '\"' + req.params.fieldname + '\"';
+                                                logger.debug("About to delete Master Type: %s : % : %", dbtype, item, req.params.fieldvalue);
+                                                eval('d4dModelNew.' + dbtype).remove({
+                                                    rowid: req.params.fieldvalue
+                                                }, function(err) {
+                                                    if (err) {
+                                                        logger.debug("Hit an errror on delete : %s", err);
+                                                        res.send(500);
+                                                        return;
+                                                    } else {
+                                                        res.send(200);
+                                                        logger.debug("Exit get() for /d4dMasters/removeitem/%s/%s/%s", req.params.id, req.params.fieldname, req.params.fieldvalue);
+                                                        return;
+                                                    }
+                                                }); //end findOne
+                                            }
+                                        }); //end configmgmtDao
+                                    } else {
+                                        logger.debug("There are dependent elements cannot delete");
+                                        res.send(412, "Cannot proceed with delete. \n Dependent elements found");
+                                        return;
+                                    }
+                                }); //deleteCheck
+                            });
+                        } else {
+                            configmgmtDao.deleteCheck(req.params.fieldvalue, tocheck, fieldname, function(err, data) {
+                                logger.debug("Delete check returned: %s", data);
+                                if (data == "none") {
+                                    logger.debug("entering delete");
+                                    configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) {
+                                        if (err) {
+                                            logger.debug("Hit and error:", err);
+                                        }
+                                        if (dbtype) {
+                                            var item = '\"' + req.params.fieldname + '\"';
+                                            logger.debug("About to delete Master Type: %s : % : %", dbtype, item, req.params.fieldvalue);
+                                            if(fieldname.indexOf('environmentname') === -1) {
+                                                eval('d4dModelNew.' + dbtype).remove({
+                                                    rowid: req.params.fieldvalue
+                                                }, function (err) {
+                                                    if (err) {
+                                                        logger.debug("Hit an errror on delete : %s", err);
+                                                        res.send(500);
+                                                        return;
+                                                    } else {
+                                                        logger.debug("Document deleted : %s", req.params.fieldvalue);
+                                                        res.send(200);
+                                                        logger.debug("Exit get() for /d4dMasters/removeitem/%s/%s/%s", req.params.id, req.params.fieldname, req.params.fieldvalue);
+                                                        return;
+                                                    }
+                                                }); //end findOne
+                                            }else{
+                                                masterUtil.getEnvironmentByEnvId(req.params.fieldvalue, function (err, environment) {
+                                                    if (err) {
+                                                        logger.debug("Hit an errror to get Environment Name : %s", err);
+                                                        res.send(500);
+                                                        return;
+                                                    } else {
+                                                        eval('d4dModelNew.' + dbtype).remove({
+                                                            rowid: req.params.fieldvalue
+                                                        }, function (err) {
+                                                            if (err) {
+                                                                logger.debug("Hit an errror on delete : %s", err);
+                                                                res.send(500);
+                                                                return;
+                                                            }else {
+                                                                settingsService.updateProjectData(environment,function(err,projectData){
+                                                                    if (err) {
+                                                                        logger.debug("Hit an error on updating the Project Master Data : %s", err);
+                                                                        res.send(500);
+                                                                        return;
+                                                                    }else {
+                                                                        appDeployPipelineService.updateAppDeployPipeLineEnviornment(environment, function (err, data) {
+                                                                            if (err) {
+                                                                                logger.debug("Hit an error on updating the PipeLine Configuration : %s", err);
+                                                                                res.send(500);
+                                                                                return;
+                                                                            }
+                                                                            res.send(200);
+                                                                            return;
+                                                                        })
+                                                                    }
+                                                                })
+                                                            }
+                                                        }); //end findOne
+                                                    }
+                                                })
+                                            }
+                                        }
+                                    }); //end configmgmtDao
+                                } else {
+                                    logger.debug("There are dependent elements cannot delete");
+                                    res.send(412, "Cannot proceed with delete. \n Dependent elements found");
+                                    return;
+                                }
+                            }); //deleteCheck
+                        }
+
+                    });
+
+                }
+            });
+        }); //haspermission
+    });
+
+    //Reading a icon file saved
+    app.get('/d4dMasters/image/:imagename', function(req, res) {
+        logger.debug("Enter get() for /d4dMasters/image/%s", req.params.imagename);
+        var settings = appConfig.chef;
+        var chefRepoPath = settings.chefReposLocation;
+        logger.debug(chefRepoPath);
+        var file = chefRepoPath + 'catalyst_files/' + req.params.imagename;
+        logger.debug(file);
+        fs.exists(file, function(exists) {
+            if (exists) {
+                fs.readFile(chefRepoPath + 'catalyst_files/' + req.params.imagename, function(err, data) {
+                    if (err) {
+                        res.end(404);
+                        return;
+                    }
+                    res.writeHead(200, {
+                        'Content-Type': 'image/gif'
+                    });
+                    res.end(data, 'binary');
+                });
+            } else {
+                res.send(404);
+            }
+        });
+        logger.debug("Exit get() for /d4dMasters/image/%s", req.params.imagename);
+    });
+    app.get('/d4dMasters/readmasterjson/:id', function(req, res) {
+        logger.debug("Enter get() for /d4dMasters/readmasterjson/%s", req.params.id);
+        d4dModel.findOne({
+            id: req.params.id
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.error("Hit and error:", err);
+            }
+            if (d4dMasterJson) {
+                res.writeHead(200, {
+                    'Content-Type': 'application/json'
+                });
+                res.end(JSON.stringify(d4dMasterJson));
+                logger.debug("sent response %s", JSON.stringify(d4dMasterJson));
+            } else {
+                res.status(400).send({
+                    "error": err
+                });
+                logger.debug("none found");
+            }
+            logger.debug("Exit get() for /d4dMasters/readmasterjson/%s", req.params.id);
+
+        });
+    });
+
+    app.get('/d4dMasters/readmasterjsonrecord/:id/:rowid', function(req, res) {
+        logger.debug("Enter get() for /d4dMasters/readmasterjsonrecord/%s/%s", req.params.id, req.params.rowid);
+        configmgmtDao.getRowids(function(err, rowidlist) {
+            configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) {
+                if (err) {
+                    logger.error("Hit and error:", err);
+                }
+                if (dbtype) {
+                    logger.debug("Master Type: %s", dbtype)
+                    eval('d4dModelNew.' + dbtype).findOne({
+                        rowid: req.params.rowid
+                    }, function(err, d4dMasterJson) {
+                        if (err) {
+                            logger.error("Hit and error:", err);
+                        }
+                        if (d4dMasterJson) {
+                            res.writeHead(200, {
+                                'Content-Type': 'application/json'
+                            });
+                            var jobj = JSON.parse(JSON.stringify(d4dMasterJson));
+                            for (var k1 in jobj) {
+                                if (k1.indexOf('_rowid') > 0) {
+                                    var flds = k1.split('_');
+                                    var names = '';
+                                    if (jobj[k1].indexOf(',') > 0) {
+                                        var itms = jobj[k1].split(',');
+                                        for (_itms in itms) {
+                                            logger.debug("in items");
+                                            if (names == '') {
+                                                names = configmgmtDao.convertRowIDToValue(itms[_itms], rowidlist);
+                                            } else {
+                                                names += ',' + configmgmtDao.convertRowIDToValue(itms[_itms], rowidlist);
+                                            }
+                                            logger.debug("names: %s", names);
+                                        }
+
+                                    } else {
+                                        names = configmgmtDao.convertRowIDToValue(jobj[k1], rowidlist)
+                                    }
+                                    d4dMasterJson[flds[0]] = names; //configmgmtDao.convertRowIDToValue(jobj[k1],rowidlist);
+                                }
+                            }
+                            res.end(JSON.stringify(d4dMasterJson));
+                            logger.debug("sent response %s", JSON.stringify(d4dMasterJson));
+                            logger.debug("Exit get() for /d4dMasters/readmasterjsonrecord/%s/%s", req.params.id, req.params.rowid);
+                        } else {
+                            res.end(JSON.stringify([]));
+                            logger.debug("none found");
+                        }
+
+
+                    });
+                }
+            });
+        }); //getRowids
+
+    });
+
+    app.get('/d4dMasters/readmasterjsonnew__/:id', function(req, res) {
+        logger.debug("Enter get() for /d4dMasters/readmasterjsonnew__/%s", req.params.id);
+        d4dModelNew.d4dModelMastersOrg.find({
+            id: req.params.id
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.debug("Hit and error:", err);
+            }
+            if (d4dMasterJson) {
+                res.writeHead(200, {
+                    'Content-Type': 'application/json'
+                });
+                res.end(JSON.stringify(d4dMasterJson));
+                logger.debug("sent response %s", JSON.stringify(d4dMasterJson));
+                logger.debug("Exit get() for /d4dMasters/readmasterjsonnew__/%s", req.params.id);
+            } else {
+                res.status(400).send({
+                    "error": err
+                });
+                logger.debug("none found");
+            }
+        });
+    });
+
+    app.get('/d4dMasters/readmasterjsonnew/:id', function(req, res) {
+        logger.debug("Enter get() for /d4dMasters/readmasterjsonnew/%s", req.params.id);
+        logger.debug("Logged in user: ", req.session.user.cn);
+        logger.debug("incomming id: ", req.params.id);
+        var loggedInUser = req.session.user.cn;
+        masterUtil.getLoggedInUser(loggedInUser, function(err, anUser) {
+            if (err) {
+                res.status(500).send("Failed to fetch User.");
+                return;
+            }
+            if (!anUser) {
+                res.status(500).send("Invalid User.");
+                return;
+            }
+            if (anUser.orgname_rowid[0] === "") {
+                // For Org
+                masterUtil.getAllActiveOrg(function(err, orgList) {
+                    logger.debug("got org list ==>", JSON.stringify(orgList));
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    }
+                    if (orgList.length === 0 && req.params.id === '21') {
+                        d4dModelNew.d4dModelMastersTeams.find({
+                            id: "21"
+                        }, function(err, data) {
+                            if (err) {
+                                logger.error("Failed to fetch Team.");
+                            }
+                            res.send(data);
+                        });
+                    } else if (req.params.id === '1') {
+                        res.send(orgList);
+                        return;
+                    } else if (req.params.id === '2') {
+                        // For BusinessGroup
+                        masterUtil.getBusinessGroups(orgList, function(err, bgList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch BG.');
+                            }
+                            res.send(bgList);
+                            return;
+                        });
+                    } else if (req.params.id === '3') {
+                        // For Environment
+                        masterUtil.getEnvironments(orgList, function(err, envList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch ENV.');
+                            }
+                            res.send(envList);
+                            return;
+                        });
+                    } else if (req.params.id === '4') {
+                        // For Projects
+                        masterUtil.getProjects(orgList, function(err, projectList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Project.');
+                            }
+                            res.send(projectList);
+                            return;
+                        })
+                    } else if (req.params.id === '10') {
+                        // For ConfigManagement
+                        masterUtil.getCongifMgmts(orgList, function(err, configMgmtList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch ConfigManagement.');
+                            }
+                            res.send(configMgmtList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '18') {
+                        // For Docker
+                        logger.debug("Id for docker: ", req.params.id);
+                        masterUtil.getDockers(orgList, function(err, dockerList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Dockers.');
+                            }
+                            res.send(dockerList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '17') {
+                        // For Template
+                        logger.debug("Id for template: ", req.params.id);
+                        masterUtil.getTemplates(orgList, function(err, templateList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Template.');
+                            }
+                            res.send(templateList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '16') {
+                        // For Template
+                        logger.debug("Id for templateType: ", req.params.id);
+                        masterUtil.getTemplateTypes(orgList, function(err, templateList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch TemplateType.');
+                            }
+                            res.send(JSON.stringify(templateList));
+                            return;
+                        });
+                    } else if (req.params.id === '19') {
+                        // For ServiceCommand
+                        masterUtil.getServiceCommands(orgList, function(err, serviceCommandList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch ServiceCommand.');
+                            }
+                            res.send(serviceCommandList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '20') {
+                        // For Jenkins
+                        masterUtil.getJenkins(orgList, function(err, jenkinList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Jenkins.');
+                            }
+                            res.send(jenkinList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '6') {
+                        // For User Role
+                        masterUtil.getUserRoles(function(err, userRoleList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch UserRole.');
+                            }
+                            res.send(userRoleList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '7') {
+                        // For User
+                        masterUtil.getUsersForOrgOrAll(orgList, function(err, userList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch User.');
+                            }
+                            res.send(userList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '21') {
+                        // For Team
+                        masterUtil.getTeams(orgList, function(err, teamList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Team.');
+                            }
+                            res.send(teamList);
+                            return;
+                        });
+                    } else if (req.params.id === '25') {
+                        // For Puppet Server
+                        masterUtil.getPuppetServers(orgList, function(err, pList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Puppet Server.');
+                            }
+                            res.send(pList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '26') {
+                        // For Puppet Server
+                        masterUtil.getNexusServers(orgList, function(err, pList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Nexus Server.');
+                            }
+                            res.send(pList);
+                            return;
+                        });
+                    } else {
+                        logger.debug('nothin here');
+                        res.send([]);
+                    }
+                });
+
+                // For non-catalystadmin
+            } else {
+                logger.debug("incomming id: ", req.params.id);
+                // For Org
+                masterUtil.getOrgs(loggedInUser, function(err, orgList) {
+                    logger.debug("got org list: ", JSON.stringify(orgList));
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    } else if (req.params.id === '1') {
+                        res.send(orgList);
+                        return;
+                    } else if (req.params.id === '2') {
+                        // For BusinessGroup
+                        masterUtil.getBusinessGroups(orgList, function(err, bgList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch BG.');
+                            }
+                            res.send(bgList);
+                            return;
+                        });
+                    } else if (req.params.id === '3') {
+                        // For Environment
+                        masterUtil.getEnvironments(orgList, function(err, envList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch ENV.');
+                            }
+                            res.send(envList);
+                            return;
+                        });
+                    } else if (req.params.id === '4') {
+                        // For Projects
+                        masterUtil.getProjects(orgList, function(err, projectList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Project.');
+                            }
+                            res.send(projectList);
+                            return;
+                        })
+                    } else if (req.params.id === '10') {
+                        // For ConfigManagement
+                        masterUtil.getCongifMgmts(orgList, function(err, configMgmtList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch ConfigManagement.');
+                            }
+                            res.send(configMgmtList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '18') {
+                        // For Docker
+                        logger.debug("Id for docker: ", req.params.id);
+                        masterUtil.getDockers(orgList, function(err, dockerList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Dockers.');
+                            }
+                            res.send(dockerList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '17') {
+                        // For Template
+                        logger.debug("Id for template: ", req.params.id);
+                        masterUtil.getTemplates(orgList, function(err, templateList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Template.');
+                            }
+                            res.send(templateList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '16') {
+                        // For Template
+                        logger.debug("Id for templateType: ", req.params.id);
+                        masterUtil.getTemplateTypes(orgList, function(err, templateList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch TemplateType.');
+                            }
+                            res.send(JSON.stringify(templateList));
+                            return;
+                        });
+
+                    } else if (req.params.id === '19') {
+                        // For ServiceCommand
+                        masterUtil.getServiceCommands(orgList, function(err, serviceCommandList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch ServiceCommand.');
+                            }
+                            res.send(serviceCommandList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '20') {
+                        // For Jenkins
+                        masterUtil.getJenkins(orgList, function(err, jenkinList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Jenkins.');
+                            }
+                            res.send(jenkinList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '6') {
+                        // For User Role
+                        masterUtil.getUserRoles(function(err, userRoleList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch UserRole.');
+                            }
+                            res.send(userRoleList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '7') {
+                        // For User
+                        masterUtil.getUsersForOrg(orgList, function(err, userList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch User.');
+                            }
+                            res.send(userList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '21') {
+                        // For Team
+                        masterUtil.getTeams(orgList, function(err, teamList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Team.');
+                            }
+                            res.send(teamList);
+                            return;
+                        });
+                    } else if (req.params.id === '25') {
+                        // For Puppet Server
+                        masterUtil.getPuppetServers(orgList, function(err, pList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Puppet Server.');
+                            }
+                            res.send(pList);
+                            return;
+                        });
+                    } else if (req.params.id === '26') {
+                        // For Puppet Server
+                        masterUtil.getNexusServers(orgList, function(err, pList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Nexus Server.');
+                            }
+                            res.send(pList);
+                            return;
+                        });
+                    } else {
+                        logger.debug('nothin here');
+                        res.send([]);
+                    }
+                });
+            }
+        });
+
+    });
+
+    app.get('/d4dMasters/readmasterjsonneworglist/:id', function(req, res) {
+        logger.debug("Enter get() for /d4dMasters/readmasterjsonneworglist/%s", req.params.id);
+        var loggedInUser = req.session.user.cn;
+        masterUtil.getLoggedInUser(loggedInUser, function(err, anUser) {
+            if (err) {
+                res.status(500).send("Failed to fetch User.");
+            }
+            if (!anUser) {
+                res.status(500).send("Invalid User.");
+            }
+            if (anUser.orgname_rowid[0] === "") {
+                configmgmtDao.getRowids(function(err, rowidlist) {
+                    configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) {
+                        if (err) {
+                            logger.error("Hit and error:", err);
+                        }
+                        if (dbtype) {
+                            logger.debug("Master Type: %s", dbtype);
+
+                            var query = {};
+
+                            query['id'] = req.params.id;
+                            if (req.params.id == '2' || req.params.id == '3' || req.params.id == '4' || req.params.id == '10') {
+                                query['active'] = true;
+                            }
+
+
+                            eval('d4dModelNew.' + dbtype).find({
+                                id: req.params.id
+                            }, function(err, d4dMasterJson) {
+                                if (err) {
+                                    logger.debug("Hit and error:", err);
+                                }
+                                //Need to iterate thru the json and find if there is a field with _rowid then convert it to prefix before sending.
+                                var _keys = Object.keys(d4dMasterJson);
+                                logger.debug("Master Length:" + _keys.length);
+                                if (_keys.length <= 0) {
+                                    logger.debug("sent response %s", JSON.stringify(d4dMasterJson));
+                                    res.end(JSON.stringify(d4dMasterJson));
+                                }
+                                var counter = 0;
+                                var todelete = [];
+                                for (var k = 0, v = 0; k < _keys.length; k++, v++) {
+                                    var jobj = JSON.parse(JSON.stringify(d4dMasterJson[k]));
+
+                                    for (var k1 in jobj) {
+                                        if (k1.indexOf('_rowid') > 0) {
+                                            //check if its an array of rowid's
+                                            var flds = k1.split('_');
+                                            var names = '';
+                                            if (jobj[k1].indexOf(',') > 0) {
+                                                var itms = jobj[k1].split(',');
+                                                for (_itms in itms) {
+                                                    var _itmsName = configmgmtDao.convertRowIDToValue(itms[_itms], rowidlist);
+                                                    if (_itmsName != '') {
+                                                        if (names == '') {
+                                                            names = _itmsName; //configmgmtDao.convertRowIDToValue(itms[_itms],rowidlist);
+                                                        } else {
+                                                            names += ',' + _itmsName; //configmgmtDao.convertRowIDToValue(itms[_itms],rowidlist);
+                                                        }
+                                                        logger.debug("names: %s", names);
+                                                    }
+                                                }
+
+                                            } else {
+                                                names = configmgmtDao.convertRowIDToValue(jobj[k1], rowidlist);
+                                            }
+
+                                            d4dMasterJson[k][flds[0]] = names;
+
+                                            if (names == '' && k1.indexOf('orgname_rowid') >= 0)
+                                                todelete.push(k);
+                                            logger.debug("jobj[flds[0]] %s %s %s %s", d4dMasterJson[k][flds[0]], flds[0], k1, k);
+                                        }
+                                    }
+                                    logger.debug("Orgname check: %s", d4dMasterJson[k]['orgname']);
+                                    counter++;
+                                };
+                                logger.debug("To Delete Array: %s", todelete.toString());
+                                var collection = [];
+                                for (var i = 0; i < d4dMasterJson.length; i++) {
+                                    if (todelete.indexOf(i) === -1) {
+                                        collection.push(d4dMasterJson[i]);
+                                    }
+                                }
+                                logger.debug("sent response 686 %s", JSON.stringify(collection));
+                                res.end(JSON.stringify(collection));
+                                logger.debug("Exit get() for /d4dMasters/readmasterjsonneworglist/%s", req.params.id);
+                            });
+                        }
+                    });
+                }); //rowidlist
+            } else {
+                // For non-catalystadmin
+                masterUtil.getOrgs(loggedInUser, function(err, orgList) {
+                    if (orgList) {
+                        logger.debug("Returned Org List: ", JSON.stringify(orgList));
+                        res.send(orgList);
+                    }
+                });
+            }
+        });
+    });
+
+    app.get('/d4dMasters/readmasterjsonnewk_/:id', function(req, res) {
+        logger.debug("Enter get() for /d4dMasters/readmasterjsonnewk_/%s", req.params.id);
+        configmgmtDao.getRowids(function(err, rowidlist) {
+            logger.debug("Rowid List: ", rowidlist);
+            d4dModelNew.d4dModelMastersOrg.find({
+                id: 1
+            }, function(err, docorgs) {
+                var orgnames = docorgs.map(function(docorgs1) {
+                    return docorgs1.rowid;
+                });
+                if (req.params.id == '2' || req.params.id == '3' || req.params.id == '10') {
+                    configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) {
+                        if (err) {
+                            logger.error("Hit and error:", err);
+                        }
+                        if (dbtype) {
+                            logger.debug("Master Type: %s", dbtype);
+                            eval('d4dModelNew.' + dbtype).find({
+                                id: req.params.id,
+                                orgname_rowid: {
+                                    $in: orgnames
+                                }
+                            }, function(err, d4dMasterJson) {
+                                if (err) {
+                                    logger.error("Hit and error:", err);
+                                }
+                                //Need to iterate thru the json and find if there is a field with _rowid then convert it to prefix before sending.
+                                var _keys = Object.keys(d4dMasterJson);
+                                _keys.forEach(function(k, v) {
+                                    var jobj = JSON.parse(JSON.stringify(d4dMasterJson[k]));
+                                    for (var k1 in jobj) {
+                                        if (k1.indexOf('_rowid')) {
+                                            var flds = k1.split('_');
+                                            jobj[flds[0]] = configmgmtDao.convertRowIDToValue(jobj[k1], rowidlist);
+                                        }
+                                        logger.debug("key: %s val: %s", k1, jobj[k1]);
+                                    }
+                                });
+                                logger.debug("sent response %s", JSON.stringify(d4dMasterJson));
+                                res.end(JSON.stringify(d4dMasterJson));
+                                logger.debug("Exit get() for /d4dMasters/readmasterjsonnewk_/%s", req.params.id);
+                            });
+                        }
+                    });
+                } //end if (1,2,3,4)
+                else if (req.params.id == '1' || req.params.id == '4') {
+                    d4dModelNew.d4dModelMastersProductGroup.find({
+                        id: 2,
+                        rowid: {
+                            $in: orgnames
+                        }
+                    }, function(err, docbgs) {
+                        var bgnames = docbgs.map(function(docbgs1) {
+                            return docbgs1.productgroupname;
+                        });
+                        configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) {
+                            if (err) {
+                                logger.error("Hit and error:", err);
+                            }
+                            if (dbtype) {
+                                logger.debug("Master Type: %s", dbtype);
+                                eval('d4dModelNew.' + dbtype).find({
+                                    id: req.params.id,
+                                    productgroupname: {
+                                        $in: bgnames
+                                    }
+                                }, function(err, d4dMasterJson) {
+                                    if (err) {
+                                        logger.error("Hit and error:", err);
+                                    }
+                                    res.end(JSON.stringify(d4dMasterJson));
+                                });
+                            }
+                        });
+                    });
+                } else {
+                    configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) {
+                        if (err) {
+                            logger.error("Hit and error:", err);
+                        }
+                        if (dbtype) {
+                            logger.debug("Master Type: %s", dbtype);
+                            eval('d4dModelNew.' + dbtype).find({
+                                id: req.params.id
+                            }, function(err, d4dMasterJson) {
+                                if (err) {
+                                    logger.error("Hit and error:", err);
+                                }
+                                res.end(JSON.stringify(d4dMasterJson));
+                            });
+                        }
+                    });
+                } //end else
+            });
+        }); //get rowid list
+    });
+
+
+    app.get('/d4dMasters/readmasterjsoncounts', function(req, res) {
+        logger.debug("Enter get() for  /d4dMasters/readmasterjsoncounts");
+        logger.debug("Logged in User: ", req.session.user.cn);
+        var ret = [];
+        var masts = ['2', '3', '4'];
+        var counts = [];
+        masterUtil.getLoggedInUser(req.session.user.cn, function(err, anUser) {
+            if (err) {
+                res.status(500).send("Failed to fetch User.");
+            }
+            if (!anUser) {
+                res.status(500).send("Invalid User.");
+            }
+            if (anUser.orgname_rowid[0] === "") {
+                for (var i = 1; i < 5; i++)
+                    counts[i] = 0;
+                d4dModelNew.d4dModelMastersOrg.find({
+                    id: 1,
+                    active: true
+                }, function(err, docorgs) {
+                    var orgnames = docorgs.map(function(docorgs1) {
+                        return docorgs1.rowid;
+                    });
+                    d4dModelNew.d4dModelMastersOrg.find({
+                        id: {
+                            $in: masts,
+                        },
+                        orgname_rowid: {
+                            $in: orgnames
+                        }
+                    }, function(err, d4dMasterJson) {
+                        if (err) {
+                            logger.error("Hit and error:", err);
+                        }
+                        if (d4dMasterJson) {
+                            res.writeHead(200, {
+                                'Content-Type': 'application/json'
+                            });
+                            logger.debug("sent response %s", JSON.stringify(d4dMasterJson));
+                            logger.debug(d4dMasterJson.length);
+                            var i = 0;
+                            for (var i = 0; i < d4dMasterJson.length; i++) {
+                                counts[d4dMasterJson[i]["id"]]++;
+                            }
+                            for (var i = 2; i < 5; i++) {
+                                ret.push('{"' + i + '":"' + counts[i] + '"}');
+                            }
+                            ret.push('{"1":"' + orgnames.length + '"}');
+                            logger.debug("Configured json: ", '[' + ret.join(',') + ']');
+                            res.end('[' + ret.join(',') + ']');
+                            return;
+                        } else {
+                            ret.push(i + ':' + '');
+                            logger.debug("none found");
+                            res.send(ret);
+                            return;
+                        }
+                    });
+                });
+            } else {
+                // For Settings Button
+                var settingsList = [];
+                var loggedInUser = req.session.user.cn;
+                var callCount = 0;
+                masterUtil.getActiveOrgs(loggedInUser, function(err, orgs) {
+                    logger.debug("got org list ==>", JSON.stringify(orgs));
+                    if (err) {
+                        res.status(500).send("Failed to fetch Org.");
+                    }
+                    if (orgs) {
+                        orgCount = orgs.length;
+                        logger.debug("orgCount: ", orgCount);
+                        if (settingsList.length === 0) {
+                            settingsList.push({
+                                "1": orgCount
+                            });
+                        }
+                        for (var s = 0; s < settingsList.length; s++) {
+                            (function(s1) {
+                                if (settingsList[s1].hasOwnProperty("1")) {
+                                    delete settingsList[s1];
+                                    settingsList.push({
+                                        "1": orgCount
+                                    });
+                                    settingsList = settingsList.filter(Object);
+                                    return;
+                                }
+                            })(s);
+                        }
+                        masterUtil.getBusinessGroups(orgs, function(err, bgs) {
+                            if (err) {
+                                res.status(500).send("Failed to fetch BGroups");
+                                return;
+                            }
+                            if (bgs) {
+                                bgCount = bgs.length;
+                                logger.debug("bgCount: ", bgCount);
+                                if (settingsList.length === 1) {
+                                    settingsList.push({
+                                        "2": bgCount
+                                    });
+                                }
+                                for (var s = 0; s < settingsList.length; s++) {
+                                    (function(s1) {
+                                        if (settingsList[s1].hasOwnProperty("2")) {
+                                            delete settingsList[s1];
+                                            settingsList.push({
+                                                "2": bgCount
+                                            });
+                                            settingsList = settingsList.filter(Object);
+                                            return;
+                                        }
+                                    })(s);
+                                }
+                            }
+                            masterUtil.getEnvironments(orgs, function(err, envs) {
+                                if (err) {
+                                    res.status(500).send("Failed to fetch ENVs.");
+                                    return;
+                                }
+                                if (envs) {
+                                    envCount = envs.length;
+                                    logger.debug("envCount: ", envCount);
+                                    if (settingsList.length === 2) {
+                                        settingsList.push({
+                                            "3": envCount
+                                        });
+                                    }
+                                    for (var s = 0; s < settingsList.length; s++) {
+                                        (function(s1) {
+                                            if (settingsList[s1].hasOwnProperty("3")) {
+                                                delete settingsList[s1];
+                                                settingsList.push({
+                                                    "3": envCount
+                                                });
+                                                settingsList = settingsList.filter(Object);
+                                                return;
+                                            }
+                                        })(s);
+                                    }
+                                }
+                                // });
+                                masterUtil.getProjects(orgs, function(err, projects) {
+                                    if (err) {
+                                        res.status(500).send("Failed to fetch Projects.");
+                                        return;
+                                    }
+                                    if (projects) {
+                                        projectCount = projects.length;
+                                        logger.debug("projectCount: ", projectCount);
+                                        if (settingsList.length === 3) {
+                                            settingsList.push({
+                                                "4": projectCount
+                                            });
+                                        }
+                                        for (var s = 0; s < settingsList.length; s++) {
+                                            (function(s1) {
+                                                if (settingsList[s1].hasOwnProperty("4")) {
+                                                    logger.debug("Has project.");
+                                                    delete settingsList[s1];
+                                                    settingsList.push({
+                                                        "4": projectCount
+                                                    });
+                                                    settingsList = settingsList.filter(Object);
+                                                    return;
+                                                }
+                                            })(s);
+                                        }
+                                    }
+                                    res.send(settingsList);
+                                    return;
+                                });
+                            });
+                        });
+                    } else {
+                        res.send(200, settingsList);
+                        return;
+                    }
+                });
+            } //else
+        });
+
+    });
+
+    app.get('/d4dMasters/getdashboardvalues/:items', function(req, res) {
+        logger.debug("Enter get() for  /d4dMasters/getdashboardvalues/%s", req.params.items);
+        var masts = [];
+        masts = req.params.items.split(',');
+        logger.debug("Exit get() for  /d4dMasters/getdashboardvalues/%s", req.params.items);
+    });
+
+    app.get('/d4dMasters/getprovider/:rowid', function(req, res) {
+        logger.debug("Enter get() for  /d4dMasters/getprovider/%s", req.params.rowid);
+        d4dModel.findOne({
+            id: '9'
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.error("Hit and error:", err);
+                return;
+            }
+            if (d4dMasterJson) {
+                var chefRepoPath = '';
+                var hasOrg = false;
+                d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) {
+                    logger.debug("found %s", itm.field.length);
+                    for (var j = 0; j < itm.field.length; j++) {
+                        if (itm.field[j]["name"] == 'rowid') {
+                            if (itm.field[j]["values"].value == req.params.rowid) {
+                                logger.debug("found: %s  -- %s", i, itm.field[j]["values"].value);
+                                hasOrg = true;
+                                //Re-construct the json with the item found
+                                var configmgmt = '';
+                                for (var k = 0; k < itm.field.length; k++) {
+                                    if (configmgmt == '')
+                                        configmgmt += "\"" + itm.field[k]["name"] + "\":\"" + itm.field[k]["values"].value + "\"";
+                                    else
+                                        configmgmt += ",\"" + itm.field[k]["name"] + "\":\"" + itm.field[k]["values"].value + "\"";
+                                }
+                                configmgmt = "{" + configmgmt + "}";
+                                logger.debug(JSON.stringify(configmgmt));
+                            }
+                        }
+                    }
+                }); // rows loop
+            }
+            logger.debug("Exit get() for  /d4dMasters/getprovider/%s", req.params.rowid);
+        });
+
+    });
+
+
+    app.get('/d4dMasters/getlist/:masterid/:fieldname', function(req, res) {
+        logger.debug("Enter get() for  /d4dMasters/getlist/%s/%s", req.params.masterid, req.params.fieldname);
+        d4dModel.findOne({
+            id: req.params.masterid
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.error("Hit and error:", err);
+            }
+            if (d4dMasterJson) {
+                var jsonlist = '';
+                d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) {
+                    logger.debug("found %s", itm.field.length);
+                    var rowid = '';
+                    var fieldvalue = '';
+                    for (var j = 0; j < itm.field.length; j++) {
+                        if (itm.field[j]["name"] == req.params.fieldname) {
+                            fieldvalue = itm.field[j]["values"].value;
+                        }
+                        if (itm.field[j]["name"] == "rowid") {
+                            rowid = itm.field[j]["values"].value;
+                        }
+                    }
+                    if (jsonlist == '')
+                        jsonlist += "\"" + fieldvalue + "\":\"" + rowid + "\"";
+                    else
+                        jsonlist += ",\"" + fieldvalue + "\":\"" + rowid + "\"";
+                });
+                configmgmt = "{" + jsonlist + "}";
+                logger.debug("Exit get() for  /d4dMasters/getlist/%s/%s", req.params.masterid, req.params.fieldname);
+            }
+        });
+    });
+
+    app.get('/d4dMasters/getlist/:masterid/:fieldname/:fieldname1', function(req, res) {
+        logger.debug("Enter get() for  /d4dMasters/getlist/%s/%s/%s", req.params.masterid, req.params.fieldname, req.params.fieldname);
+        d4dModel.findOne({
+            id: req.params.masterid
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.error("Hit and error:", err);
+                res.end(null);
+            }
+            if (d4dMasterJson) {
+                var jsonlist = '';
+                d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) {
+                    logger.debug("found %s", itm.field.length);
+                    var rowid = '';
+                    var fieldvalue = '';
+                    for (var j = 0; j < itm.field.length; j++) {
+                        if (itm.field[j]["name"] == req.params.fieldname) {
+                            fieldvalue = itm.field[j]["values"].value;
+                        }
+                        if (itm.field[j]["name"] == req.params.fieldname1) {
+                            rowid = itm.field[j]["values"].value;
+                        }
+                    }
+                    if (jsonlist == '')
+                        jsonlist += "{\"" + req.params.fieldname + "\":\"" + fieldvalue + "\",\"" + req.params.fieldname1 + "\":\"" + rowid + "\"}";
+                    else
+                        jsonlist += ",{\"" + req.params.fieldname + "\":\"" + fieldvalue + "\",\"" + req.params.fieldname1 + "\":\"" + rowid + "\"}";
+
+                });
+                configmgmt = "[" + jsonlist + "]";
+                logger.debug("Exit get() for  /d4dMasters/getlist/%s/%s/%s", req.params.masterid, req.params.fieldname, req.params.fieldname);
+                res.end(configmgmt);
+                return;
+            } else {
+                res.send(404);
+                return;
+            }
+        });
+    });
+
+    app.get('/d4dMasters/getorgnamebychefserver/:chefserver', function(req, res) {
+        logger.debug("Enter get() for  /d4dMasters/getorgnamebychefserver/%s", req.params.chefserver);
+        configmgmtDao.getListFiltered(10, 'orgname', 'configname', req.params.chefserver, function(err, catorgname) {
+            if (err) {
+                res.send(500);
+                return;
+            }
+            if (!catorgname) {
+                res.send('');
+                logger.debug("Exit get() for  /d4dMasters/getorgnamebychefserver/%s", req.params.chefserver);
+                return;
+            } else {
+                res.end(catorgname);
+                logger.debug("Exit get() for  /d4dMasters/getorgnamebychefserver/%s", req.params.chefserver);
+                return;
+            }
+
+
+        });
+    });
+    app.post('/d4dMasters/getListFiltered/:masterid', function(req, res) {
+        logger.debug("Enter post() for  /d4dMasters/getListFiltered/%s", req.params.masterid);
+        if (req.params.masterid === "10" && typeof req.body.orgname != "undefined") {
+            logger.debug("Request body   : ", JSON.stringify(req.body));
+            var orgName = req.body.orgname;
+            d4dModelNew.d4dModelMastersOrg.find({
+                orgname: orgName,
+                id: "1",
+                active: true
+            }, function(err, anOrg) {
+                if (err) {
+                    logger.debug("Error occored to get Org.");
+                    return;
+                }
+                if (anOrg.length) {
+                    var query = {};
+                    query['id'] = req.params.masterid;
+                    query['orgname_rowid'] = anOrg[0].rowid;
+                    d4dModelNew.d4dModelMastersConfigManagement.find(query, function(err, d4dMasterJson) {
+                        if (err) {
+                            logger.error("Hit and error:", err);
+                        }
+                        if (d4dMasterJson.length > 0) {
+                            logger.debug("sent response %s", JSON.stringify(d4dMasterJson));
+                            res.send("Found");
+                            logger.debug("Exit post() for  /d4dMasters/getListFiltered/%s", req.params.masterid);
+                        } else {
+                            logger.debug("sent response %s", JSON.stringify(d4dMasterJson));
+                            res.send("Not Found");
+                        }
+                    });
+                } else {
+                    res.send("Org Not Found");
+                    return;
+                }
+            });
+        } else {
+
+            configmgmtDao.getDBModelFromID(req.params.masterid, function(err, dbtype) {
+                if (err) {
+                    logger.error("Hit and error:", err);
+                }
+                if (dbtype) {
+                    var query = {};
+                    query['id'] = req.params.masterid;
+                    logger.debug("Req.body for glf %s", JSON.stringify(req.body));
+                    var bodyJson = JSON.parse(JSON.stringify(req.body));
+                    logger.debug("Query Build in getListFiltered: %s", JSON.stringify(bodyJson));
+                    var _keys = Object.keys(bodyJson);
+                    _keys.forEach(function(k, v) {
+                        logger.debug(k, bodyJson[k]);
+                        query[k] = bodyJson[k];
+                    });
+                    eval('d4dModelNew.' + dbtype).find(query, function(err, d4dMasterJson) {
+                        if (err) {
+                            logger.error("Hit and error:", err);
+                        }
+                        logger.debug("getListFiltered %s", d4dMasterJson.length);
+                        if (d4dMasterJson.length > 0) {
+                            logger.debug("sent response %s", JSON.stringify(d4dMasterJson));
+                            res.send("Found");
+                            logger.debug("Exit post() for  /d4dMasters/getListFiltered/%s", req.params.masterid);
+                        } else {
+                            logger.debug("sent response %s", JSON.stringify(d4dMasterJson));
+                            res.send("Not Found");
+                        }
+                    });
+                } else {
+                    res.send(500);
+                }
+            });
+        }
+    });
+
+    app.get('/d4dMasters/:masterid/:filtercolumnname/:filtercolumnvalue', function(req, res) {
+        logger.debug("Enter get() for  /d4dMasters/%s/%s/%s", req.params.masterid, req.params.filtercolumnname, req.params.filtercolumnvalue);
+        configmgmtDao.getDBModelFromID(req.params.masterid, function(err, dbtype) {
+            if (err) {
+                logger.error("Hit and error:", err);
+            }
+            if (dbtype) {
+                var query = {};
+                query[req.params.filtercolumnname] = req.params.filtercolumnvalue; //building the query
+                query['id'] = req.params.masterid;
+
+                logger.debug("Master Type: %s", dbtype);
+                eval('d4dModelNew.' + dbtype).find(query, function(err, d4dMasterJson) {
+                    if (err) {
+                        logger.error("Hit and error:", err);
+                    }
+                    res.end(JSON.stringify(d4dMasterJson));
+                    logger.debug("Exit get() for  /d4dMasters/%s/%s/%s", req.params.masterid, req.params.filtercolumnname, req.params.filtercolumnvalue);
+                });
+            }
+        });
+    });
+
+    app.get('/d4dMasters/configmgmt/:rowid', function(req, res) {
+        logger.debug("Enter get() for  /d4dMasters/configmgmt/%s", req.params.rowid);
+        d4dModel.findOne({
+            id: '10'
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.error("Hit and error:" + err);
+            }
+            if (d4dMasterJson) {
+                var chefRepoPath = '';
+                settingsController.getChefSettings(function(settings) {
+                    chefRepoPath = settings.chefReposLocation;
+                    logger.debug("Repopath: %s", chefRepoPath);
+
+                    var hasOrg = false;
+                    d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) {
+                        logger.debug("found %s", itm.field.length);
+                        for (var j = 0; j < itm.field.length; j++) {
+                            if (itm.field[j]["name"] == 'rowid') {
+                                if (itm.field[j]["values"].value == req.params.rowid) {
+                                    logger.debug("found: %s -- %s", i, itm.field[j]["values"].value);
+                                    hasOrg = true;
+                                    //Re-construct the json with the item found
+                                    var configmgmt = '';
+                                    var orgname = '';
+                                    var loginname = '';
+                                    //looping to get the orgname , loginname
+                                    for (var k = 0; k < itm.field.length; k++) {
+                                        if (itm.field[k]["name"].indexOf("login") >= 0)
+                                            loginname = itm.field[k]["values"].value + "/";
+                                        if (itm.field[k]["name"].indexOf("orgname") >= 0)
+                                            orgname = itm.field[k]["values"].value + "/";
+                                    }
+
+                                    for (var k = 0; k < itm.field.length; k++) {
+                                        if (itm.field[k]["name"].indexOf("filename") > 0) {
+                                            if (configmgmt == '')
+                                                configmgmt += "\"" + itm.field[k]["name"].replace('_filename', '') + "\":\"" + chefRepoPath + orgname + loginname + '.chef/' + itm.field[k]["values"].value + "\"";
+                                            else
+                                                configmgmt += ",\"" + itm.field[k]["name"].replace('_filename', '') + "\":\"" + chefRepoPath + orgname + loginname + '.chef/' + itm.field[k]["values"].value + "\"";
+
+                                        }
+                                    }
+                                    configmgmt = "{" + configmgmt + "}";
+                                    logger.debug(JSON.stringify(configmgmt));
+                                    logger.debug("Exit get() for  /d4dMasters/configmgmt/%s", req.params.rowid);
+                                }
+                            }
+
+                            // logger.debug();
+                        }
+                    }); // rows loop
+                }); //setting closure
+            }
+        });
+    });
+
+    app.get('/d4dMasters/getuuid', function(req, res) {
+        logger.debug("Enter get() for  /d4dMasters/getuuid");
+        var uuid1 = uuid.v4();
+        res.writeHead(200, {
+            'Content-Type': 'application/json'
+        });
+        res.end(JSON.stringify(uuid1));
+        logger.debug("sent response %s", JSON.stringify('{"uuid":"' + uuid1 + '"}'));
+        logger.debug("Exit get() for  /d4dMasters/getuuid");
+    });
+
+
+    var fs = require('fs');
+    var path = require('path');
+
+    fs.mkdirParent = function(dirPath, mode, callback) {
+        //Call the standard fs.mkdir
+        fs.mkdir(dirPath, mode, function(error) {
+            //When it fail in this way, do the custom steps
+            if (error && error.errno === 34) {
+                //Create all the parents recursively
+                fs.mkdirParent(path.dirname(dirPath), mode, callback);
+                //And then the directory
+                fs.mkdirParent(dirPath, mode, callback);
+            }
+            //Manually run the callback since we used our own callback to do all these
+            callback && callback(error);
+        });
+    };
+
+    function mkdir_p(path, mode, callback, position) {
+        mode = mode || 0777;
+        position = position || 0;
+        parts = require('path').normalize(path).split('/');
+        var directory = parts.slice(0, position + 1).join('/');
+        logger.debug("stage 2 %s", directory);
+        fs.mkdirSync(directory, mode);
+        if (position >= parts.length) {
+            return (true);
+        } else
+            mkdir_p(path, mode, null, position + 1);
+    }
+    var mkdirSync1 = function(path) {
+        try {
+            fs.mkdirSync(path, 0777);
+        } catch (e) {}
+    }
+
+    function updateProjectWithEnv(project, bodyJson) {
+        d4dModelNew.d4dModelMastersEnvironments.find({
+            id: "3",
+            rowid: bodyJson['rowid']
+        }, function(err, envs) {
+            if (err) {
+                logger.debug("Failed to fetch Env.", err);
+            } else if (envs.length > 0) {
+                var newEnv = '';
+                var envName = '';
+                if (project.environmentname_rowid !== '' && project.environmentname !== '') {
+                    var projectEnvId = project.environmentname_rowid.split(",");
+                    var projectEnvName = project.environmentname.split(",");
+                    if (projectEnvId.indexOf(bodyJson['rowid']) === -1 && projectEnvName.indexOf(bodyJson['environmentname']) === -1) {
+                        newEnv = project.environmentname_rowid + ',' + bodyJson['rowid'];
+                        envName = project.environmentname + ',' + bodyJson['environmentname'];
+                    } else if (projectEnvId.indexOf(bodyJson['rowid']) !== -1) {
+                        var index = projectEnvId.indexOf(bodyJson['rowid']);
+                        projectEnvName[index] = bodyJson['environmentname'];
+                        newEnv = project.environmentname_rowid;
+                        envName = changeArrayToString(projectEnvName);
+                    } else {
+                        return;
+                    }
+                } else {
+                    newEnv = bodyJson['rowid'];
+                    envName = bodyJson['environmentname'];
+                }
+                d4dModelNew.d4dModelMastersProjects.update({
+                    rowid: project.rowid,
+                    id: '4'
+                }, {
+                    $set: {
+                        environmentname_rowid: newEnv,
+                        environmentname: envName
+                    }
+                }, {
+                    upsert: false
+                }, function (err, data1) {
+                    if (err) {
+                        logger.debug('Err while updating d4dModelMastersProjects' + err);
+                        return;
+                    }
+                    logger.debug('Updated project ' + project.projectname + ' with env : ' + envName);
+                    return;
+                });
+            }else {
+                return;
+            }
+        });
+    };
+
+
+
+    function findDeselectedItem(CurrentArray, PreviousArray) {
+        var CurrentArrSize = CurrentArray.length;
+        var PreviousArrSize = PreviousArray.length;
+        var missing = [];
+        // loop through previous array
+        for (var j = 0; j < PreviousArrSize; j++) {
+
+            // look for same thing in new array
+            if (CurrentArray.indexOf(PreviousArray[j]) == -1) {
+                missing.push(PreviousArray[j]);
+            }
+
+        }
+        return missing;
+
+    }
+
+    function changeArrayToString(list){
+        var resultStr='';
+        for(var i = 0; i < list.length; i++){
+            resultStr = resultStr + list[i] + ',';
+        }
+        if(resultStr.slice(-1) === ','){
+            var res = resultStr.slice(0,-1);
+            return res;
+        }else{
+            return resultStr;
+        }
+    }
+
+
+    function removeStringFromArray(list,str){
+        var resultStr='';
+        for(var i = 0; i < list.length; i++){
+            if (i === list.length - 1) {
+                if(str !== list[i]) {
+                    resultStr = resultStr + list[i];
+                }
+            } else {
+                if(str !== list[i]) {
+                    resultStr = resultStr + list[i] + ',';
+                }
+            }
+        }
+        if(resultStr.slice(-1) === ','){
+            var res = resultStr.slice(0,-1);
+            return res;
+        }else{
+            return resultStr;
+        }
+    }
+
+
+
+    function dissociateProjectWithEnv(projects, bodyJson) {
+        for(var i = 0; i < projects.length; i++) {
+            (function(project) {
+                var projectEnvId = project.environmentname_rowid.split(",");
+                var projectEnvName = project.environmentname.split(",");
+                d4dModelNew.d4dModelMastersProjects.update({
+                    rowid: project.rowid,
+                    id: '4'
+                }, {
+                    $set: {
+                        environmentname_rowid: removeStringFromArray(projectEnvId, bodyJson['rowid']),
+                        environmentname: removeStringFromArray(projectEnvName, bodyJson['environmentname'])
+                    }
+                }, {
+                    upsert: false
+                }, function (err, data1) {
+                    if (err) {
+                        logger.debug('Err while updating d4dModelMastersProjects' + err);
+                        return;
+                    }
+                    logger.debug('Updated project ' + project.projectname + ' with env : ' + envName);
+                    return;
+                });
+            })(projects[i]);
+        };
+    };
+
+    function saveuploadedfile(suffix, folderpath, req) {
+        logger.debug(req.body);
+        var fi;
+        if (req.params.fileinputs.indexOf(',') > 0)
+            fi = req.params.fileinputs.split(',');
+        else {
+            fi = new Array();
+            fi.push(req.params.fileinputs);
+        }
+        var bodyItems = Object.keys(req.body);
+        var saveAsfileName = '';
+        for (var i = 0; i < bodyItems.length; i++) {
+            if (bodyItems[i].indexOf("_filename") > 0)
+                saveAsfileName = req.body[bodyItems[i]];
+        }
+
+
+        var filesNames = Object.keys(req.files);
+        var count = filesNames.length;
+        filesNames.forEach(function(item) {
+            logger.debug(item);
+        });
+
+        var settings = appConfig.chef;
+
+        var chefRepoPath = settings.chefReposLocation;
+
+        if (req.params.id === "25") {
+            settings = appConfig.puppet;
+            chefRepoPath = settings.puppetReposLocation;
+        }
+
+
+
+        logger.debug("Type of org : %s", typeof req.params.orgname);
+        logger.debug("Org ID: %s", req.params.orgid);
+        logger.debug(chefRepoPath + req.params.orgname + folderpath.substring(0, folderpath.length - 1));
+        logger.debug("Orgname : # %s # %s", req.params.orgname.toString(), (req.params.orgname == ''));
+
+        //Handling the exception to handle uploads without orgname
+        if (req.params.orgname) {
+            if (req.params.orgname === '/')
+                req.params.orgname = '';
+
+            if (req.params.orgname === '' || req.params.orgname === "undefined") {
+                req.params.orgname = "catalyst_files";
+            }
+        }
+        var path = chefRepoPath + req.params.orgid + folderpath.substring(0, folderpath.length - 1);
+        parts = require('path').normalize(path).split('/');
+        logger.debug("Length of parts: %s", parts.length);
+        for (var i = 1; i <= parts.length; i++) {
+            var directory = parts.slice(0, i).join('/');
+            logger.debug(directory);
+            mkdirSync1(directory);
+        }
+
+        logger.debug("files: %s", fi.length);
+        for (var i = 0; i < fi.length; i++) {
+            var controlName = fi[i];
+            var fil = eval('req.files.' + fi[i]);
+            if (typeof fil != 'undefined') {
+
+                var data = fs.readFileSync(fil.path); //, function(err, data) {
+                if (folderpath == '') {
+                    logger.debug("this is where file gets saved as (no folderpath): %s %s / %s %s __ %s", chefRepoPath, req.params.orgname, suffix, controlName, fil.name);
+                    fs.writeFile(chefRepoPath + req.params.orgname + '/' + suffix + controlName + '__' + fil.name, data);
+                    logger.debug("File saved Successfully: ");
+                } else {
+                    if (folderpath.indexOf('.chef') > 0) { //identifying if its a chef config file
+                        logger.debug("this is where file gets saved as .chef (with folderpath):    %s %s %s %s", chefRepoPath, req.params.orgid, folderpath, fil.name);
+                        fs.writeFile(chefRepoPath + req.params.orgid + folderpath + fil.name, data);
+                    } else if (folderpath.indexOf('.puppet') > 0) { //identifying if its a chef config file
+                        logger.debug("this is where file gets saved as .chef (with folderpath) for puppet:    %s %s %s %s", chefRepoPath, req.params.orgid, folderpath, fil.name);
+                        fs.writeFile(chefRepoPath + req.params.orgid + folderpath + fil.name, data);
+                    } else //not a a chef config file
+                    {
+                        logger.debug("Folderpath rcvd: %s", folderpath);
+
+                        if (fil.name == saveAsfileName) {
+                            logger.debug("this is where file gets saved as (with folderpath): %s %s / %s %s __ %s", chefRepoPath, req.params.orgid, suffix, controlName, fil.name);
+                            fs.writeFile(chefRepoPath + req.params.orgname + '/' + suffix + controlName + '__' + fil.name, data);
+
+                        } else {
+                            logger.debug("this is where file gets saved as (with folderpath) fixed name: %s %s %s / %s", chefRepoPath, req.params.orgid, folderpath, saveAsfileName);
+                            fs.writeFile(chefRepoPath + req.params.orgname + folderpath + '/' + saveAsfileName, data);
+                        }
+
+                    }
+                }
+            }
+        }
+        logger.debug("Before ssl fetch");
+        if (req.params.id == '10') {
+            logger.debug("In ssl fetch");
+            var options = {
+                cwd: chefRepoPath + req.params.orgid + folderpath,
+                onError: function(err) {
+                    callback(err, null);
+                },
+                onClose: function(code) {
+                    callback(null, code);
+                }
+            };
+            var cmdSSLFetch = 'knife ssl fetch';
+
+            var procSSLFetch = exec(cmdSSLFetch, options, function(err, stdOut, stdErr) {
+                if (err) {
+                    logger.debug("Failed on procSSLFetch routes d4dMasters:", err);
+                    return;
+                }
+            });
+            procSSLFetch.on('close', function(code) {
+                logger.debug("procSSLFetch done: ");
+            });
+
+            procSSLFetch.stdout.on('data', function(data) {
+                logger.debug("procSSLFetch : %s", data);
+            });
+        }
+        return ("200");
+    }
+
+
+    app.post('/d4dmasters/getrows/:masterid', function(req, res) {
+        logger.debug("Enter post() for  /d4dmasters/getrows/%s", req.params.masterid);
+        configmgmtDao.getDBModelFromID(req.params.masterid, function(err, dbtype) {
+            if (err) {
+                logger.error("Hit and error:", err);
+            }
+            if (dbtype) {
+                var query = {};
+                query['rowid'] = {
+                    '$in': req.body.serviceids
+                }
+                query['id'] = req.params.masterid;
+
+                logger.debug("Master Type: %s", dbtype);
+                eval('d4dModelNew.' + dbtype).find(query, function(err, d4dMasterJson) {
+                    if (err) {
+                        logger.error("Hit and error:", err);
+                    }
+                    res.end(JSON.stringify(d4dMasterJson));
+                    logger.debug("sent response %s", JSON.stringify(d4dMasterJson));
+                    logger.debug("Exit post() for  /d4dmasters/getrows/%s", req.params.masterid);
+                });
+            } else {
+                res.send(500);
+            }
+        });
+    });
+
+    app.post('/d4dMastersold/getrows/:masterid', function(req, res) {
+        logger.debug("Enter post() for  /d4dMastersold/getrows/%s", req.params.masterid);
+        d4dModel.findOne({
+            id: req.params.masterid
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.error("Hit and error:", err);
+            }
+            if (d4dMasterJson) {
+                var bodyJson = JSON.parse(JSON.stringify(req.body));
+
+                if (bodyJson["serviceids"] != null) {
+                    var root = '';
+                    bodyJson["serviceids"].forEach(function(serviceid, servicecount) {
+                        logger.debug("%s :: %s", serviceid, servicecount);
+                        d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) {
+                            logger.debug("found %s", itm.field.length);
+                            var configmgmt = '';
+                            for (var j = 0; j < itm.field.length; j++) {
+                                if (itm.field[j]["name"] == 'rowid') {
+                                    if (itm.field[j]["values"].value == serviceid) {
+                                        logger.debug("found: %s -- %s", i, itm.field[j]["values"].value);
+                                        hasOrg = true;
+                                        //Re-construct the json with the item found
+                                        for (var k = 0; k < itm.field.length; k++) {
+                                            if (configmgmt == '')
+                                                configmgmt += "\"" + itm.field[k]["name"] + "\":\"" + itm.field[k]["values"].value + "\"";
+                                            else
+                                                configmgmt += ",\"" + itm.field[k]["name"] + "\":\"" + itm.field[k]["values"].value + "\"";
+                                        }
+                                    }
+                                }
+                            }
+                            if (configmgmt != '') {
+                                if (root != '')
+                                    root += ",{" + configmgmt + "}";
+                                else
+                                    root += "{" + configmgmt + "}";;
+                            }
+
+                        }); // rows loop
+                    });
+                    root = '[' + root + ']';
+                    res.send(JSON.parse(root));
+                    logger.debug("Exit post() for  /d4dMastersold/getrows/%s", req.params.masterid);
+
+                }
+
+            }
+
+        });
+    });
+
+    app.post('/d4dMasters/savemasterjsonfull/:id', function(req, res) {
+        logger.debug("Enter post() for  /d4dMasters/savemasterjsonfull/%s", req.params.id);
+        d4dModel.findOne({
+            id: req.params.id
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.error("Hit and error:", err);
+            }
+            if (d4dMasterJson) {
+                var bodyJson = JSON.parse(JSON.stringify(req.body));
+
+                //pushing the rowid field
+                var editMode = false; //to identify if in edit mode.
+                var uuid1 = uuid.v4();
+                var rowtoedit = null;
+                if (bodyJson["rowid"] != null) { //for edit
+                    editMode = true;
+                    for (var u = 0; u < d4dMasterJson.masterjson.rows.row.length; u++) {
+                        logger.debug("Value: %s", bodyJson["rowid"]);
+                        if (d4dMasterJson.masterjson.rows.row[u].rowid == bodyJson["rowid"]) {
+                            rowtoedit = d4dMasterJson.masterjson.rows.row[u];
+                        }
+                    }
+                } else //for insert
+                {
+                    bodyJson["rowid"] = uuid1;
+                }
+                var frmkeys = Object.keys(bodyJson);
+                var rowFLD = [];
+                logger.debug(JSON.stringify(bodyJson));
+                frmkeys.forEach(function(itm) {
+                    if (!editMode) {
+                        var thisVal = bodyJson[itm];
+                        var item;
+
+                        if (thisVal.indexOf('[') >= 0) //used to check if its an array
+                            item = "{\"" + itm + "\" : " + thisVal + "}";
+                        else
+                            item = "{\"" + itm + "\" : \"" + thisVal.replace(/\"/g, '\\"') + "\"}";
+
+                        rowFLD.push(JSON.parse(item));
+                    } else {
+
+                    }
+                });
+                var FLD = "{" + JSON.stringify(rowFLD) + "}";
+                logger.debug("Exit post() for  /d4dMasters/savemasterjsonfull/%s", req.params.id);
+            }
+
+        });
+    });
+
+
+    app.post('/d4dMasters/savemasterjsonrow/:id/:fileinputs/:orgname', function(req, res) {
+        logger.debug('Enter post() for  /d4dMasters/savemasterjsonrow/%s/%s/%s', req.params.id, req.params.fileinputs, req.params.orgname);
+        d4dModel.findOne({
+            id: req.params.id
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.error("Hit and error:", err);
+            }
+            if (d4dMasterJson) {
+                var bodyJson = JSON.parse(JSON.stringify(req.body));
+
+                //pushing the rowid field
+                var uuid1 = uuid.v4();
+                var editMode = false; //to identify if in edit mode.
+                var rowtoedit = null;
+                if (bodyJson["rowid"] != null) {
+                    editMode = true;
+                    for (var u = 0; u < d4dMasterJson.masterjson.rows.row.length; u++) {
+                        for (var i = 0; i < d4dMasterJson.masterjson.rows.row[u].field.length; i++) {
+                            logger.debug("Value: %s", bodyJson[d4dMasterJson.masterjson.rows.row[u].field[i].name]);
+                            if (d4dMasterJson.masterjson.rows.row[u].field[i].values.value == bodyJson["rowid"]) {
+
+                                rowtoedit = d4dMasterJson.masterjson.rows.row[u];
+
+                            }
+                        }
+                    }
+                } else
+                    bodyJson["rowid"] = uuid1;
+                if (rowtoedit) //testing if the rowtoedit has a value
+                    logger.debug("Edited Row: %s", JSON.stringify(rowtoedit));
+                var frmkeys = Object.keys(bodyJson);
+                var rowFLD = [];
+                var folderpath = ''; //will hold the folderpath field to create the path in the system
+                frmkeys.forEach(function(itm) {
+                    if (!editMode) {
+                        var thisVal = bodyJson[itm];
+                        logger.debug("thisVal %s", thisVal);
+                        var item;
+
+                        if (thisVal.indexOf('[') >= 0 && itm != "templatescookbooks") { //used to check if its an array
+                            item = "{\"values\" : {\"value\" : " + thisVal + "},\"name\" : \"" + itm + "\"}";
+                        } else
+                            item = "{\"values\" : {\"value\" : \"" + thisVal.replace(/\"/g, '\\"') + "\"},\"name\" : \"" + itm + "\"}";
+                        rowFLD.push(JSON.parse(item));
+                        if (itm == 'folderpath') { //special variable to hold the folder to which the files will be copied.
+                            folderpath = thisVal;
+                        }
+                    } else { //in edit mode
+                        if (rowtoedit) {
+                            uuid1 = bodyJson["rowid"];
+                            logger.debug("Bodyjson[folderpath]: %s", bodyJson["folderpath"]);
+                            if (bodyJson["folderpath"] == undefined) //folderpath issue fix
+                                folderpath = ''
+                            else
+                                folderpath = bodyJson["folderpath"];
+                            for (var j = 0; j < rowtoedit.field.length; j++) {
+                                if (bodyJson[rowtoedit.field[j].name] != null) {
+                                    rowtoedit.field[j].values.value = bodyJson[rowtoedit.field[j].name];
+                                    logger.debug("Entered Edit %s", rowtoedit.field[j].values.value);
+                                }
+                            }
+                        }
+                    }
+
+                });
+                logger.debug("Changed");
+                var FLD = "{\"field\":" + JSON.stringify(rowFLD) + "}";
+                if (!rowtoedit) { //push new values only when not in edit mode
+                    d4dMasterJson.masterjson.rows.row.push(JSON.parse(FLD));
+                }
+                d4dModel.update({
+                    "id": req.params.id
+                }, {
+                    $set: {
+                        "masterjson": d4dMasterJson.masterjson
+                    }
+                }, {
+                    upsert: false
+                }, function(err, data) {
+                    if (err) {
+                        callback(err, null);
+                        res.send(500);
+                        return;
+                    }
+                    // To do save uploaded files.
+                    logger.debug("folderpath: %s", folderpath);
+                    //resetting the orgname when saving template
+                    if (req.params.id == '17') {
+                        req.params.orgname = '';
+                    }
+                    if (req.params.fileinputs != 'null')
+                        res.send(saveuploadedfile(uuid1 + '__', folderpath, req));
+                    else
+                        res.send(200);
+
+                    if (req.params.id == '10') {
+
+                    }
+                    logger.debug("Exit post() for  /d4dMasters/savemasterjsonrow/%s/%s/%s", req.params.id, req.params.fileinputs, req.params.orgname);
+                });
+            }
+        });
+    });
+
+    app.post('/d4dMasters/deactivateorg/:action', function(req, res) {
+        logger.debug("Enter post() for /d4dMasters/deactivateorg/%s", req.params.action);
+        var bodyJson = JSON.parse(JSON.stringify(req.body));
+        if (!req.orgid) {
+            logger.debug('Org ID found %s', bodyJson.orgid);
+            configmgmtDao.deactivateOrg(bodyJson.orgid, req.params.action, function(err, data) {
+                if (err) {
+                    logger.error('Error: ', err);
+                    res.send(500);
+                }
+                logger.debug('=== %s', data);
+                res.send(200);
+                logger.debug("Exit post() for /d4dMasters/deactivateorg/%s", req.params.action);
+            });
+        }
+    });
+
+    app.post('/d4dMasters/savemasterjsonrownew/:id/:fileinputs/:orgname', function(req, res) {
+        logger.debug("Enter post() for /d4dMasters/savemasterjsonrownew/%s/%s/%s", req.params.id, req.params.fileinputs, req.params.orgname);
+        var bodyJson = JSON.parse(JSON.stringify(req.body));
+        //pushing the rowid field
+        var editMode = false; //to identify if in edit mode.
+        var rowtoedit = null;
+        if (bodyJson["rowid"] != null) {
+            editMode = true;
+        } else {
+            editMode = false;
+            bodyJson["rowid"] = uuid.v4();
+        }
+        //Authorize user to create / modify.
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID(req.params.id);
+        var permissionto = 'create';
+        if (editMode == true) {
+            permissionto = 'modify';
+        }
+
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
+            if (err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                res.status(500).send("Server Error");
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                }
+                logger.debug("LoggedIn User: ", JSON.stringify(anUser));
+                if (anUser) {
+                    logger.debug("All condition: data", data, " rowid: ", anUser.orgname_rowid[0], " role: ", anUser.userrolename);
+                    logger.debug('EditMode: %s', editMode);
+                    bodyJson["id"] = req.params.id; //storing the form id.
+
+                    // Handled for "any" field Org for User.
+                    if (req.params.id === '7' && bodyJson["orgname"] === "") {
+                        logger.debug("Inside if for empty");
+                        bodyJson["orgname"] = "";
+                        bodyJson["orgname_rowid"] = "";
+                    }
+
+                    if (req.params.id === "10") {
+                        bodyJson["configType"] = "chef";
+                    }
+                    if (req.params.id === "26") {
+                        bodyJson["configType"] = "nexus";
+                    }
+                    if (req.params.id === "18") {
+                        bodyJson["configType"] = "docker";
+                    }
+                    logger.debug("Full bodyJson:::: ", JSON.stringify(bodyJson));
+                    if (req.params.id === "25") {
+                        bodyJson["configType"] = "puppet";
+                        if (bodyJson["puppetpassword"]) {
+                            bodyJson["puppetpassword"] = cryptography.encryptText(bodyJson["puppetpassword"], cryptoConfig.encryptionEncoding, cryptoConfig.decryptionEncoding);
+                        } else {
+                            bodyJson["folderpath"] = "/" + bodyJson["username"] + "/.puppet/";
+                        }
+                        logger.debug("encryptText: ", bodyJson["puppetpassword"]);
+                    }
+                    if (req.params.id === "3") {
+                        if (!bodyJson["environmentname"]) {
+                            bodyJson["environmentname"] = bodyJson["puppetenvironmentname"];
+                        }
+                    }
+                    configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) {
+                        if (err) {
+                            logger.error("Hit and error:", err);
+                        }
+                        if (dbtype) {
+                            logger.debug("Master Type: %s", dbtype);
+
+                            eval('d4dModelNew.' + dbtype).findOne({
+                                rowid: bodyJson["rowid"]
+                            }, function(err, d4dMasterJson) {
+                                if (err) {
+                                    logger.error("Hit and error:", err);
+                                }
+                                if (d4dMasterJson) {
+                                    rowtoedit = JSON.parse(JSON.stringify(d4dMasterJson));
+                                    logger.debug('Reached here %s', (rowtoedit == null));
+                                }
+                                var frmkeys = Object.keys(bodyJson);
+                                var orgid = '';
+                                if (frmkeys.indexOf('orgname_rowid') >= 0) {
+                                    req.params['orgid'] = bodyJson['orgname_rowid'];
+                                }
+                                var rowFLD = [];
+                                var folderpath = ''; //will hold the folderpath field to create the path in the system
+                                var newrowid = '';
+                                frmkeys.forEach(function(itm) {
+                                    logger.debug("Each item: itm %s bodyJson[itm] %s", itm, bodyJson[itm]);
+                                    if (itm.trim() == 'rowid') {
+                                        logger.debug('!!!! in rowid %s', bodyJson[itm]);
+                                        newrowid = bodyJson[itm];
+                                    }
+                                    if (!editMode) {
+                                        var thisVal = bodyJson[itm];
+                                        logger.debug(thisVal);
+                                        var item = null;
+                                        if (thisVal.indexOf('[') >= 0 && itm != "templatescookbooks") { //used to check if its an array
+                                            item = "\"" + itm + "\" : \"" + thisVal + "\"";
+                                        } else //
+                                            item = "\"" + itm + "\" : \"" + thisVal.replace(/\"/g, '\\"') + "\"";
+                                        rowFLD.push(item);
+                                        if (itm == 'folderpath') { //special variable to hold the folder to which the files will be copied.
+                                            rowFLD.push("\"" + itm + "\" : \"" + thisVal.replace(/\"/g, '\\"') + "\"");
+                                            logger.debug('Got a folderpath: %s', thisVal);
+                                            folderpath = thisVal;
+                                        }
+                                    } else {
+                                        if (d4dMasterJson != null) {
+                                            uuid1 = bodyJson["rowid"];
+                                            if (bodyJson["folderpath"] == undefined) //folderpath issue fix
+                                                folderpath = ''
+                                            else
+                                                folderpath = bodyJson["folderpath"];
+                                            var fldadded = false;
+                                            for (var myval in rowtoedit) {
+                                                if (itm == myval) {
+                                                    rowtoedit[myval] = bodyJson[myval];
+                                                    fldadded = true;
+                                                }
+                                            }
+                                            if (!fldadded) {
+                                                logger.debug('Not Added ---------> %s', itm);
+                                                if (bodyJson[itm] != '') //found to have a value
+                                                {
+                                                    rowtoedit[itm] = bodyJson[itm];
+                                                }
+                                            }
+                                        }
+                                    }
+                                });
+                                var FLD = JSON.stringify(rowFLD);
+                                if (!editMode) { //push new values only when not in edit mode
+                                    // Start Auto create Team
+                                    if (req.params.id === '1') {
+                                        var orgData = {
+                                            "orgname": bodyJson['orgname'],
+                                            "domainname": bodyJson['domainname'],
+                                            "rowid": bodyJson['rowid'],
+                                            "id": "1"
+                                        }
+                                        var orgObj = new d4dModelNew.d4dModelMastersOrg(orgData);
+                                        orgObj.save(function(err, anOrg) {
+                                            if (err) {
+                                                res.status(500).send("Failed to save Org.");
+                                                return;
+                                            }
+                                            for (var x1 = 0; x1 < 5; x1++) {
+                                                (function(x1) {
+                                                    var templatetypename;
+                                                    var designtemplateicon_filename;
+                                                    var templatetype;
+                                                    if (x1 === 0) {
+                                                        templatetypename = "SoftwareStack";
+                                                        designtemplateicon_filename = "Appfactory.png";
+                                                        templatetype = "chef";
+                                                    } else if (x1 === 1) {
+                                                        templatetypename = "OSImage";
+                                                        designtemplateicon_filename = "Desktop Provisining.png";
+                                                        templatetype = "ami";
+                                                    } else if (x1 === 2) {
+                                                        templatetypename = "CloudFormation";
+                                                        designtemplateicon_filename = "CloudFormation.png";
+                                                        templatetype = "cft";
+
+                                                    } else if (x1 === 3) {
+                                                        templatetypename = "ARMTemplate";
+                                                        designtemplateicon_filename = "CloudFormation.png";
+                                                        templatetype = "arm";
+                                                    } else {
+                                                        templatetypename = "Docker";
+                                                        designtemplateicon_filename = "Docker.png";
+                                                        templatetype = "docker";
+                                                    }
+
+                                                    var templateTypeData = {
+                                                        "templatetypename": templatetypename,
+                                                        "orgname": bodyJson["orgname"],
+                                                        "orgname_rowid": bodyJson["rowid"],
+                                                        "rowid": uuid.v4(),
+                                                        "id": "16",
+                                                        "templatetype": templatetype
+
+                                                    };
+
+                                                    var templateTypeModel = new d4dModelNew.d4dModelMastersDesignTemplateTypes(templateTypeData);
+                                                    templateTypeModel.save(function(err, aTemplateType) {
+                                                        if (err) {
+                                                            logger.debug("Failed to save TemplateType.");
+                                                        }
+                                                        logger.debug("Default TemplateType created.");
+                                                    });
+                                                })(x1);
+                                            }
+                                            for (var x = 0; x < 4; x++) {
+                                                (function(x) {
+                                                    var teamName;
+                                                    var descriptions;
+                                                    if (x === 0) {
+                                                        teamName = bodyJson["orgname"] + "_Admins";
+                                                        descriptions = "Team For " + teamName;
+                                                    } else if (x === 1) {
+                                                        teamName = bodyJson["orgname"] + "_DEV";
+                                                        descriptions = "Team For " + teamName;
+                                                    } else if (x === 2) {
+                                                        teamName = bodyJson["orgname"] + "_QA";
+                                                        descriptions = "Team For " + teamName;
+                                                    } else {
+                                                        teamName = bodyJson["orgname"] + "_DevOps";
+                                                        descriptions = "Team For " + teamName;
+                                                    }
+
+                                                    var teamData = {
+                                                        "teamname": teamName,
+                                                        "description": descriptions,
+                                                        "orgname": bodyJson["orgname"],
+                                                        "orgname_rowid": bodyJson["rowid"],
+                                                        "rowid": uuid.v4(),
+                                                        "id": "21",
+                                                        "loginname": "",
+                                                        "loginname_rowid": "",
+                                                        "projectname": "",
+                                                        "projectname_rowid": ""
+
+                                                    };
+                                                    var teamModel = new d4dModelNew.d4dModelMastersTeams(teamData);
+                                                    teamModel.save(function(err, aTeam) {
+                                                        if (err) {
+                                                            logger.debug("Failed to save Team.");
+                                                        }
+                                                        logger.debug("Auto created Team: ", JSON.stringify(aTeam));
+                                                    });
+                                                    if (x === 3) {
+                                                        res.send(200);
+                                                        return;
+                                                    }
+                                                })(x);
+
+                                            }
+
+                                        });
+                                    } else if (req.params.id === '7') {
+                                        authUtil.hashPassword(bodyJson["password"], function(err, hashedPassword) {
+                                            if (err) {
+                                                logger.error('Hit error', err);
+                                                res.send(500);
+                                                return;
+                                            }
+                                            logger.debug("hashedPassword: ", hashedPassword);
+                                            bodyJson["password"] = hashedPassword;
+                                            var userModel = new d4dModelNew.d4dModelMastersUsers(bodyJson);
+                                            userModel.save(function(err, data) {
+                                                if (err) {
+                                                    logger.error('Hit Save error', err);
+                                                    res.send(500);
+                                                    return;
+
+                                                }
+                                                var teamName = bodyJson["teamname"].split(",");
+                                                var rowId = bodyJson["teamname_rowid"].split(",");
+                                                for (var x = 0; x < rowId.length; x++) {
+                                                    d4dModelNew.d4dModelMastersTeams.find({
+                                                        rowid: rowId[x]
+                                                    }, function(err, teamData) {
+                                                        if (err) {
+                                                            logger.debug("Error : ", err);
+                                                        }
+                                                        teamData[0].loginname = teamData[0].loginname + "," + bodyJson["loginname"];
+                                                        teamData[0].loginname_rowid = teamData[0].loginname_rowid + "," + bodyJson["rowid"];
+                                                        if (teamData[0].loginname.length > 0 && teamData[0].loginname_rowid.length > 0) {
+                                                            if (teamData[0].loginname.substring(0, 1) == ',') {
+                                                                teamData[0].loginname = teamData[0].loginname.substring(1);
+                                                            }
+                                                            if (teamData[0].loginname_rowid.substring(0, 1) == ',') {
+                                                                teamData[0].loginname_rowid = teamData[0].loginname_rowid.substring(1);
+                                                            }
+                                                        }
+                                                        d4dModelNew.d4dModelMastersTeams.update({
+                                                            rowid: teamData[0].rowid
+                                                        }, {
+                                                            $set: JSON.parse(JSON.stringify(teamData[0]))
+                                                        }, {
+                                                            upsert: false
+                                                        }, function(err, updatedTeam) {
+                                                            if (err) {
+                                                                logger.debug("Failed to update Team: ", errorResponses.db.error);
+                                                            }
+                                                            logger.debug("Successfully Team updated with User.");
+                                                        });
+
+                                                    });
+                                                    if (x === rowId.length - 1) {
+                                                        res.send(200);
+                                                        return;
+                                                    }
+                                                }
+                                            });
+                                        });
+
+                                    } else if (req.params.id === '4') {
+                                        bodyJson['repositories'] = JSON.parse(bodyJson['repositories']);
+                                        var projectModel = new d4dModelNew.d4dModelMastersProjects(bodyJson);
+                                        projectModel.save(function(err, data) {
+                                            if (err) {
+                                                logger.error('Hit Save error', err);
+                                                res.send(500);
+                                                return;
+                                            }
+                                            res.send(200);
+                                            return;
+                                        });
+                                    } else if (req.params.id === '26') {
+                                        bodyJson['groupid'] = JSON.parse(bodyJson['groupid']);
+                                        var nexusModel = new d4dModelNew.d4dModelMastersNexusServer(bodyJson);
+                                        nexusModel.save(function(err, data) {
+                                            if (err) {
+                                                logger.error('Hit Save error', err);
+                                                res.send(500);
+                                                return;
+                                            }
+                                            res.send(200);
+                                            return;
+                                        });
+                                    } else {
+                                        eval('var mastersrdb =  new d4dModelNew.' + dbtype + '({' + JSON.parse(FLD) + '})');
+                                        mastersrdb.save(function(err, data) {
+                                            if (err) {
+                                                logger.error('Hit Save error', err);
+                                                res.send(500);
+                                                return;
+
+                                            }
+                                            logger.debug('New Master Saved');
+                                            logger.debug(req.params.fileinputs == 'null');
+                                            logger.debug('New record folderpath: % rowid %s FLD["folderpath"]:', folderpath, newrowid, folderpath);
+                                            if (!folderpath) {
+                                                if (FLD["folderpath"] == undefined) //folderpath issue fix
+                                                    folderpath = ''
+                                                else
+                                                    folderpath = rowFLD["folderpath"];
+                                            }
+                                            //if env is saved then it should be associated with project.
+                                            if (req.params.id == '3') {
+                                                var projectIds = bodyJson['projectname_rowid'].split(",");
+                                                for (var i = 0; i < projectIds.length; i++) {
+                                                    d4dModelNew.d4dModelMastersProjects.findOne({
+                                                        rowid: projectIds[i],
+                                                        id: "4"
+                                                    }, function(err,project) {
+                                                        if (!err) {
+                                                            updateProjectWithEnv(project, bodyJson);
+                                                        }
+                                                    });
+                                                }
+                                            }
+                                            //resetting the orgname to empty string when a template type file is uploaded.
+                                            if (req.params.id == '17') {
+                                                req.params.orgname = "undefined";
+                                            }
+                                            if (req.params.fileinputs != 'null')
+                                                res.send(saveuploadedfile(newrowid + '__', folderpath, req));
+                                            else
+                                                res.send(200);
+                                            return;
+                                        });
+                                    }
+                                } else {
+
+                                    // Update settings
+                                    if (req.params.id === '4') {
+                                        bodyJson['repositories'] = JSON.parse(bodyJson['repositories']);
+                                        delete rowtoedit._id; //fixing the issue of
+                                        rowtoedit["repositories"] = bodyJson['repositories'];
+                                        logger.debug('Rowtoedit: %s', JSON.stringify(rowtoedit));
+                                        eval('d4dModelNew.' + dbtype).update({
+                                            rowid: bodyJson["rowid"],
+                                            "id": "4"
+                                        }, {
+                                            $set: rowtoedit
+                                        }, {
+                                            upsert: false
+                                        }, function(err, saveddata) {
+                                            if (err) {
+                                                logger.error('Hit Save error', err);
+                                                res.send(500);
+                                                return;
+                                            }
+                                            res.send(200);
+                                            return;
+                                        });
+                                    }
+
+                                    if (req.params.id === '26') {
+                                        bodyJson['groupid'] = JSON.parse(bodyJson['groupid']);
+                                        delete rowtoedit._id; //fixing the issue of
+                                        rowtoedit["groupid"] = bodyJson['groupid'];
+                                        logger.debug('Rowtoedit: %s', JSON.stringify(rowtoedit));
+                                        eval('d4dModelNew.' + dbtype).update({
+                                            rowid: bodyJson["rowid"],
+                                            "id": "26"
+                                        }, {
+                                            $set: rowtoedit
+                                        }, {
+                                            upsert: false
+                                        }, function(err, saveddata) {
+                                            if (err) {
+                                                logger.error('Hit Save error', err);
+                                                res.send(500);
+                                                return;
+                                            }
+                                            res.send(200);
+                                            return;
+                                        });
+                                    }
+                                    if (req.params.id === "7") {
+                                        d4dModelNew.d4dModelMastersUsers.find({
+                                            "id": req.params.id,
+                                            loginname: bodyJson["loginname"]
+                                        }, function(err, anUser) {
+                                            if (err) {
+                                                logger.debug("Error to fetch user.");
+                                                res.status(500).send("Error to fetch User.");
+                                                return;
+                                            }
+                                            logger.debug("Fetched User: ", JSON.stringify(anUser));
+                                            if (anUser.length) {
+                                                if (bodyJson["password"] === '') {
+
+                                                    delete rowtoedit._id; //fixing the issue of
+                                                    if (bodyJson["orgname"] === "") {
+                                                        logger.debug("Inside if for empty for update..");
+                                                        rowtoedit["orgname"] = [""];
+                                                        rowtoedit["orgname_rowid"] = [""];
+                                                    }
+                                                    rowtoedit["password"] = anUser[0].password;
+                                                    logger.debug('Rowtoedit: %s', JSON.stringify(rowtoedit));
+                                                    eval('d4dModelNew.' + dbtype).update({
+                                                        rowid: bodyJson["rowid"],
+                                                        "id": "7"
+                                                    }, {
+                                                        $set: rowtoedit
+                                                    }, {
+                                                        upsert: false
+                                                    }, function(err, saveddata) {
+                                                        if (err) {
+                                                            logger.error('Hit Save error', err);
+                                                            res.send(500);
+                                                            return;
+                                                        }
+                                                        res.send(200);
+                                                        return;
+                                                    });
+
+                                                } else if (bodyJson["password"] != anUser[0].password) {
+                                                    authUtil.hashPassword(bodyJson["password"], function(err, hashedPassword) {
+                                                        if (err) {
+                                                            logger.error('Hit error', err);
+                                                            res.send(500);
+                                                            return;
+                                                        }
+                                                        logger.debug("hashedPassword: ", hashedPassword);
+                                                        delete rowtoedit._id; //fixing the issue of
+                                                        if (bodyJson["orgname"] === "") {
+                                                            rowtoedit["orgname"] = [""];
+                                                            rowtoedit["orgname_rowid"] = [""];
+                                                        }
+                                                        rowtoedit["password"] = hashedPassword;
+                                                        logger.debug('Rowtoedit: %s', JSON.stringify(rowtoedit));
+                                                        eval('d4dModelNew.' + dbtype).update({
+                                                            rowid: bodyJson["rowid"],
+                                                            "id": "7"
+                                                        }, {
+                                                            $set: rowtoedit
+                                                        }, {
+                                                            upsert: false
+                                                        }, function(err, saveddata) {
+                                                            if (err) {
+                                                                logger.error('Hit Save error', err);
+                                                                res.send(500);
+                                                                return;
+                                                            }
+                                                            res.send(200);
+                                                            return;
+                                                        });
+                                                    });
+                                                } else {
+                                                    delete rowtoedit._id; //fixing the issue of
+                                                    if (bodyJson["orgname"] === "") {
+                                                        rowtoedit["orgname"] = [""];
+                                                        rowtoedit["orgname_rowid"] = [""];
+                                                    }
+                                                    logger.debug('Rowtoedit: %s', JSON.stringify(rowtoedit));
+                                                    eval('d4dModelNew.' + dbtype).update({
+                                                        rowid: bodyJson["rowid"],
+                                                        "id": "7"
+                                                    }, {
+                                                        $set: rowtoedit
+                                                    }, {
+                                                        upsert: false
+                                                    }, function(err, saveddata) {
+                                                        if (err) {
+                                                            logger.error('Hit Save error', err);
+                                                            res.send(500);
+                                                            return;
+                                                        }
+                                                        res.send(200);
+                                                        return;
+                                                    });
+                                                }
+                                            } else {
+                                                res.send(404);
+                                                return;
+                                            }
+                                        });
+                                    }
+                                    if (req.params.id === "3") {
+                                        d4dModelNew.d4dModelMastersProjects.find({
+                                            environmentname_rowid: {
+                                                $regex: bodyJson['rowid']
+                                            },
+                                            id: "4"
+                                        }, function(err,project) {
+                                            if (!err) {
+                                                dissociateProjectWithEnv(project, bodyJson);
+                                            }
+                                        });
+                                    }
+                                    logger.debug("Rowid: %s", bodyJson["rowid"]);
+                                    var currowid = bodyJson["rowid"];
+                                    delete rowtoedit._id; //fixing the issue of
+                                    logger.debug('Rowtoedit: %s', JSON.stringify(rowtoedit));
+                                    eval('d4dModelNew.' + dbtype).update({
+                                        rowid: bodyJson["rowid"]
+                                    }, {
+                                        $set: rowtoedit
+                                    }, {
+                                        upsert: false
+                                    }, function(err, saveddata) {
+                                        if (err) {
+                                            logger.error('Hit Save error', err);
+                                            res.send(500);
+                                            return;
+                                        }
+
+                                        if (bodyJson["folderpath"] == undefined) //folderpath issue fix
+                                            folderpath = ''
+                                        else
+                                            folderpath = bodyJson["folderpath"];
+
+                                        //if env is saved then it should be associated with project.
+                                        if (req.params.id == '3') {
+                                            var projectIds = bodyJson['projectname_rowid'].split(",");
+                                            for (var i = 0; i < projectIds.length; i++) {
+                                                d4dModelNew.d4dModelMastersProjects.findOne({
+                                                    rowid: projectIds[i],
+                                                    id: "4"
+                                                }, function(err,project) {
+                                                    if (!err) {
+                                                        updateProjectWithEnv(project, bodyJson);
+                                                    }
+                                                });
+                                            }
+                                        }
+                                        if (req.params.id === '21') {
+                                            var projectName = bodyJson["projectname"];
+                                            d4dModelNew.d4dModelMastersTeams.update({
+                                                rowid: bodyJson["rowid"],
+                                                id: "21"
+                                            }, {
+                                                $set: {
+                                                    projectname: projectName
+                                                }
+                                            }, {
+                                                upsert: false
+                                            }, function(err, updateCount) {
+                                                if (err) {
+                                                    logger.debug("Team update Fail..", err);
+                                                }
+                                            });
+                                        }
+
+                                        if (req.params.id === '1') {
+                                            masterUtil.updateTeam(bodyJson['rowid'], function(err, aBody) {
+                                                if (err) {
+                                                    logger.debug("Error on update Org.".err);
+                                                }
+                                                logger.debug("Return body: ", JSON.stringify(aBody));
+                                            });
+                                        }
+
+                                        logger.debug('Master Data Updated: %s', saveddata);
+                                        logger.debug('folderpath: %s rowid %s', folderpath, currowid);
+                                        //resetting the orgname to empty string when a template type file is uploaded.
+                                        if (req.params.id == '17') {
+                                            req.params.orgname = "undefined";
+                                        }
+                                        if (req.params.fileinputs != 'null')
+                                            res.send(saveuploadedfile(currowid + '__', folderpath, req));
+                                        else
+                                            res.send(200);
+                                        logger.debug("Exit post() for /d4dMasters/savemasterjsonrownew/%s/%s/%s", req.params.id, req.params.fileinputs, req.params.orgname);
+                                        return;
+                                    });
+                                }
+
+                            }); //end findone
+
+                        }
+                    }); //end getdbmodelfromid
+                } // if
+            }); // getSingleUser
+        }); //end of haspermission
+
+    });
+
+    function autoCreateTeams(bodyJson) {
+        for (var x = 0; x < 4; x++) {
+            var teamName;
+            var descriptions;
+            if (x === 0) {
+                teamName = bodyJson["orgname"] + "_Admins";
+                descriptions = "Team For " + teamName;
+            } else if (x === 1) {
+                teamName = bodyJson["orgname"] + "_DEV";
+                descriptions = "Team For " + teamName;
+            } else if (x === 2) {
+                teamName = bodyJson["orgname"] + "_QA";
+                descriptions = "Team For " + teamName;
+            } else {
+                teamName = bodyJson["orgname"] + "_DevOps";
+                descriptions = "Team For " + teamName;
+            }
+
+            var teamData = {
+                "teamname": teamName,
+                "description": descriptions,
+                "orgname": bodyJson["orgname"],
+                "orgname_rowid": bodyJson["rowid"],
+                "rowid": uuid.v4(),
+                "id": "21"
+            };
+            var teamModel = new d4dModelNew.d4dModelMastersTeams(teamData);
+            teamModel.save(function(err, aTeam) {
+                if (err) {
+                    logger.error("Failed to save Team: ", err);
+                }
+                logger.debug("Auto created Team: ", JSON.stringify(aTeam));
+            });
+
+        }
+    }
+
+    app.post('/d4dMasters/testingupload/:suffix/:fileinputs', function(req, res) {
+        logger.debug("Enter post() for /d4dMasters/testingupload/%s/%s", req.params.suffix, req.params.fileinputs);
+        var fi;
+        if (req.params.fileinputs.indexOf(',') > 0)
+            fi = req.params.fileinputs.split(',');
+        else {
+            fi = new Array();
+            fi.push(req.params.fileinputs);
+        }
+
+        var filesNames = Object.keys(req.files);
+        var count = filesNames.length;
+        logger.debug('in %s', count);
+        filesNames.forEach(function(item) {
+            logger.debug(item);
+        });
+
+        settingsController.getChefSettings(function(settings) {
+            var chefRepoPath = settings.chefReposLocation;
+            fs.mkdirParent(chefRepoPath + req.params.orgname); //if path is not present create it.
+            for (var i = 0; i < fi.length; i++) {
+                var controlName = fi[i];
+                var fil = eval('req.files.' + fi[i]);
+                if (typeof fil != 'undefined') {
+                    logger.debug('this is where file gets saved  : %s %s', chefRepoPath, fil.name);
+                    fileIo.readFile(fil.path, function(err, data) {
+                        fileIo.writeFile(chefRepoPath + req.params.orgname + '/' + controlName + '__' + fil.name, data, null, function(err) {
+                            logger.error("Hit error: ", err);
+                            count--;
+                            if (count === 0) { // all files uploaded
+                                res.send("ok");
+                            }
+                        });
+                    });
+                }
+            }
+        });
+        res.send(200);
+        logger.debug("Exit post() for /d4dMasters/testingupload/%s/%s", req.params.suffix, req.params.fileinputs);
+    });
+
+    app.post('/d4dMasters/savemasterjson/:id', function(req, res) {
+        //Finding the Master Json if present
+        logger.debug("Enter post() for /d4dMasters/savemasterjson/%s", req.params.id);
+        d4dModel.findOne({
+            id: req.params.id
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.error("Hit and error:", err);
+            }
+            if (!d4dMasterJson) {
+                var d4dmj = new d4dModel({
+                    id: '1',
+                    masterjson: req.body
+                });
+                d4dmj.save(function(err, d4dmj) {
+                    if (err) {
+                        logger.error("Hit and error:", err)
+                        res.send(500);
+                    };
+                    logger.debug('saved');
+                });
+                res.send(200);
+            } else {
+                d4dMasterJson.masterjson = req.body;
+                d4dMasterJson.save(function(err, d4dMasterJson) {
+                    if (err) {
+                        logger.error("Hit and error:", err)
+                    }
+                    logger.debug('updated');
+                });
+                res.send(200);
+            }
+            logger.debug("Exit post() for /d4dMasters/savemasterjson/%s", req.params.id);
+        });
+        //mongoose.disconnect();
+    });
+
+    app.get('/createbg/:orgname/:bgname', function(req, res) {
+        logger.debug("Enter get() for /createbg/%s/%s", req.params.orgname, req.params.bgname);
+        var bgfield = "{\"field\":[{\"values\":{\"value\":\"" + req.params.bgname + "\"},\"name\":\"productgroupname\"},{\"values\":{\"value\":\"" + req.params.orgname + "\"},\"name\":\"orgname\"},{\"name\":\"costcode\"}] }";
+        db.on('error', console.error.bind(console, 'connection error:'));
+        logger.debug(JSON.stringify(bgfield));
+        db.once('open', function callback() {
+            logger.debug('in once');
+        });
+        d4dModel.findOne({
+            id: '2'
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.error("Hit and error:", err);
+            }
+            if (d4dMasterJson) {
+                var hasOrg = false;
+                d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) {
+                    for (var j = 0; j < itm.field.length; j++) {
+                        if (itm.field[j]["name"] == 'productgroupname') {
+                            if (itm.field[j]["values"].value == req.params.bgname) {
+                                logger.debug("found: %s -- %s", i, itm.field[j]["values"].value);
+                                hasOrg = true;
+                            }
+                        }
+                    }
+                });
+                if (hasOrg == false) {
+                    //Creating org
+                    logger.debug('Creating');
+                    d4dMasterJson.masterjson.rows.row.push(JSON.parse(bgfield));
+                    d4dModel.update({
+                        "id": "2"
+                    }, {
+                        $set: {
+                            "masterjson": d4dMasterJson.masterjson
+                        }
+                    }, {
+                        upsert: false
+                    }, function(err, data) {
+                        if (err) {
+                            callback(err, null);
+                            res.send(500);
+                            return;
+                        }
+                        res.send(200);
+                    });
+                } else {
+                    res.send(200);
+                }
+
+            } else {
+                res.status(500).send({
+                    "error": err
+                });
+            }
+            logger.debug("Exit get() for /createbg/%s/%s", req.params.orgname, req.params.bgname);
+
+        });
+    });
+
+
+    app.get('/createproj/:orgname/:envname/:prodgroup/:projname', function(req, res) {
+        logger.debug("Enter get() for /createproj/%s/%s/%s/%s", req.params.orgname, req.params.envname, req.params.prodgroup, req.params.projname);
+        var projField = "{\"field\":[{\"values\":{\"value\":\"" + req.params.projname + "\"},\"name\":\"projectname\"},{\"values\":{\"value\":\"" + req.params.orgname + "\"},\"name\":\"orgname\"},{\"values\":{\"value\":\"" + req.params.prodgroup + "\"},\"name\":\"productgroupname\"},{\"values\":{\"value\":\"" + req.params.envname + "\"},\"name\":\"environmentname\"},{\"values\":{\"value\":[\"Code 1\",\"Code 2\"]},\"name\":\"costcode\"}] }";
+        db.on('error', console.error.bind(console, 'connection error:'));
+        logger.debug(JSON.stringify(projField));
+        db.once('open', function callback() {
+            logger.debug('in once');
+        });
+        logger.debug('received request %s', req.params.orgname);
+        d4dModel.findOne({
+            id: '4'
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.error("Hit and error:", err);
+            }
+            if (d4dMasterJson) {
+                var hasOrg = false;
+                d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) {
+                    logger.debug("found %s", itm.field.length);
+
+                    for (var j = 0; j < itm.field.length; j++) {
+                        if (itm.field[j]["name"] == 'projectname') {
+                            if (itm.field[j]["values"].value == req.params.projname) {
+                                logger.debug("found: %s -- %s", i, itm.field[j]["values"].value);
+                                hasOrg = true;
+                            }
+                        }
+                    }
+                });
+                if (hasOrg == false) {
+                    //Creating org
+                    logger.debug('Creating');
+                    d4dMasterJson.masterjson.rows.row.push(JSON.parse(projField));
+                    d4dModel.update({
+                        "id": "4"
+                    }, {
+                        $set: {
+                            "masterjson": d4dMasterJson.masterjson
+                        }
+                    }, {
+                        upsert: false
+                    }, function(err, data) {
+                        if (err) {
+                            callback(err, null);
+                            res.send(500);
+                            return;
+                        }
+                        res.send(200);
+                    });
+                } else {
+                    res.send(200);
+                }
+
+            } else {
+                res.status(500).send({
+                    "error": err
+                });
+            }
+            logger.debug("Exit get() for /createproj/%s/%s/%s/%s", req.params.orgname, req.params.envname, req.params.prodgroup, req.params.projname);
+
+        });
+    });
+
+
+    app.get('/createenv/:orgname/:envname', function(req, res) {
+        logger.debug("Enter get() for /createenv/%s/%s", req.params.orgname, req.params.envname);
+        var envField = "{\"field\":[{\"name\":\"environmentname\",\"values\":{\"value\":\"" + req.params.envname + "\"}},{\"name\":\"orgname\",\"values\":{\"value\":\"" + req.params.orgname + "\"}}]}";
+        db.on('error', console.error.bind(console, 'connection error:'));
+        logger.debug(JSON.stringify(envField));
+        db.once('open', function callback() {
+
+        });
+        logger.debug('received request %s', req.params.orgname);
+        d4dModel.findOne({
+            id: '3'
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.error("Hit and error:", err);
+            }
+            if (d4dMasterJson) {
+                var hasOrg = false;
+                d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) {
+                    logger.debug("found %s", itm.field.length);
+
+                    for (var j = 0; j < itm.field.length; j++) {
+                        if (itm.field[j]["name"] == 'environmentname') {
+                            if (itm.field[j]["values"].value == req.params.envname) {
+                                logger.debug("found: %s -- %s", i, itm.field[j]["values"].value);
+                                hasOrg = true;
+                            }
+                        }
+                    }
+                });
+                if (hasOrg == false) {
+                    //Creating org
+                    logger.debug('Creating');
+                    d4dMasterJson.masterjson.rows.row.push(JSON.parse(envField));
+                    d4dModel.update({
+                        "id": "3"
+                    }, {
+                        $set: {
+                            "masterjson": d4dMasterJson.masterjson
+                        }
+                    }, {
+                        upsert: false
+                    }, function(err, data) {
+                        if (err) {
+                            callback(err, null);
+                            res.send(500);
+                            return;
+                        }
+                        res.send(200);
+                    });
+                } else {
+                    res.send(200);
+                }
+
+            } else {
+                res.status(500).send({
+                    "error": err
+                });
+            }
+            logger.debug("Exit get() for /createenv/%s/%s", req.params.orgname, req.params.envname);
+        });
+    });
+
+
+    app.get('/createorg/:orgname', function(req, res) {
+        logger.debug("Enter get() for /createorg/%s", req.params.orgname);
+        var orgField = "{\"field\":[{\"values\":{\"value\":\"" + req.params.orgname + "\"},\"name\":\"orgname\"},{\"values\":{\"value\":\"\"},\"name\":\"domainname\"},{\"values\":{\"value\":[\"Dev\",\"Test\",\"Stage\"]},\"name\":\"costcode\"}]}";
+        db.on('error', console.error.bind(console, 'connection error:'));
+        db.once('open', function callback() {
+            logger.debug('in once');
+        });
+        logger.debug('received request %s', req.params.orgname);
+        d4dModel.findOne({
+            id: '1'
+        }, function(err, d4dMasterJson) {
+            if (err) {
+                logger.error("Hit and error: ", err);
+            }
+            if (d4dMasterJson) {
+                var hasOrg = false;
+                d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) {
+                    for (var j = 0; j < itm.field.length; j++) {
+                        if (itm.field[j]["name"] == 'orgname') {
+                            if (itm.field[j]["values"].value == req.params.orgname) {
+                                logger.debug("found: %s -- %s", i, itm.field[j]["values"].value);
+                                hasOrg = true;
+                            }
+                        }
+                    }
+                });
+                if (hasOrg == false) {
+                    //Creating org
+                    logger.debug('Creating');
+                    d4dMasterJson.masterjson.rows.row.push(JSON.parse(orgField));
+                    d4dModel.update({
+                        "id": "1"
+                    }, {
+                        $set: {
+                            "masterjson": d4dMasterJson.masterjson
+                        }
+                    }, {
+                        upsert: false
+                    }, function(err, data) {
+                        if (err) {
+                            callback(err, null);
+                            res.send(500);
+                            return;
+                        }
+                        res.send(200);
+                    });
+                } else {
+                    res.send(200);
+                }
+
+            } else {
+                res.status(500).send({
+                    "error": err
+                });
+            }
+            logger.debug("Exit get() for /createorg/%s", req.params.orgname);
+
+        });
+    });
+
+    app.get('/d4dMasters/:chefserver/cookbooks', function(req, res) {
+        logger.debug("Enter get() for /d4dMasters/%s/cookbooks", req.params.chefserver);
+        configmgmtDao.getChefServerDetailsByChefServer(req.params.chefserver, function(err, chefDetails) {
+            if (err) {
+                res.send(500);
+                return;
+            }
+            logger.debug("chefdata %s", chefDetails);
+
+            if (!chefDetails) {
+                res.send(404);
+                return;
+            }
+            var chef = new Chef({
+                userChefRepoLocation: chefDetails.chefRepoLocation,
+                chefUserName: chefDetails.loginname,
+                chefUserPemFile: chefDetails.userpemfile,
+                chefValidationPemFile: chefDetails.validatorpemfile,
+                hostedChefUrl: chefDetails.url,
+            });
+            chef.getCookbooksList(function(err, cookbooks) {
+                logger.error(err);
+                if (err) {
+                    res.send(500);
+                    return;
+                } else {
+                    res.send({
+                        serverId: chefDetails.rowid,
+                        cookbooks: cookbooks
+                    });
+                    logger.debug("Exit get() for /d4dMasters/%s/cookbooks", req.params.chefserver);
+                }
+            });
+        });
+    });
+
+    app.post('/d4dMasters/test', function(req, res) {
+        var bodyJson = JSON.parse(JSON.stringify(req.body));
+        configmgmtDao.getProjectsForTeams(bodyJson['teamids'], function(err, data) {
+            if (!err) {
+                res.send(data);
+            }
+        });
+    });
+
+    app.get('/d4dMasters/:chefserver/roles', function(req, res) {
+        logger.debug("Enter get() for /d4dMasters/%s/roles", req.params.chefserver);
+        configmgmtDao.getChefServerDetailsByChefServer(req.params.chefserver, function(err, chefDetails) {
+            if (err) {
+                res.send(500);
+                return;
+            }
+            logger.debug("chefdata %s", chefDetails);
+            if (!chefDetails) {
+                res.send(404);
+                return;
+            }
+            var chef = new Chef({
+                userChefRepoLocation: chefDetails.chefRepoLocation,
+                chefUserName: chefDetails.loginname,
+                chefUserPemFile: chefDetails.userpemfile,
+                chefValidationPemFile: chefDetails.validatorpemfile,
+                hostedChefUrl: chefDetails.url,
+            });
+
+            chef.getRolesList(function(err, roles) {
+                logger.error(err);
+                if (err) {
+                    res.send(500);
+                    return;
+                } else {
+                    res.send({
+                        serverId: chefDetails.rowid,
+                        roles: roles
+                    });
+                    logger.debug("Exit get() for /d4dMasters/%s/roles", req.params.chefserver);
+                }
+            });
+        });
+    });
+
+    app.get('/d4dMasters/loggedInUser', function(req, res) {
+        var loggedInUser = req.session.user.cn;
+        masterUtil.getLoggedInUser(loggedInUser, function(err, anUser) {
+            if (err) {
+                res.status(500).send("Failed to fetch User.");
+            }
+            if (!anUser) {
+                res.status(500).send("Invalid User.");
+            }
+            if (anUser.orgname_rowid[0] === "") {
+                res.send({
+                    "isSuperAdmin": true
+                });
+                return;
+            } else {
+                res.send({
+                    "isSuperAdmin": false
+                });
+                return;
+            }
+        });
+    });
+
+    app.get('/d4dMasters/orgs/all/users/7', function(req, res) {
+        masterUtil.getUsersForAllOrg(function(err, users) {
+            if (err) {
+                res.status(500).send("Failed to fetch User.");
+            }
+            res.send(users);
+            return;
+        });
+    });
+
+    app.get('/d4dMasters/cftTemplate', function(req, res) {
+        var templateFile = req.query.templateFile;
+        var settings = appConfig.chef;
+        var chefRepoPath = settings.chefReposLocation;
+        fs.readFile(chefRepoPath + 'catalyst_files/' + templateFile, function(err, data) {
+            if (err) {
+                logger.error("Unable to read template file " + templateFile, err);
+                res.status(500).send({
+                    message: "Unable to read file"
+                });
+                return;
+            }
+            res.send(200, data);
+        });
+
+    });
+    app.get('/d4dMasters/configmanagement', function(req, res) {
+        masterUtil.getAllActiveOrg(function(err, orgList) {
+            logger.debug("got org list ==>", JSON.stringify(orgList));
+            if (err) {
+                res.status(500).send('Not able to fetch Orgs.');
+                return;
+            }
+            masterUtil.getAllCongifMgmts(orgList, function(err, list) {
+                if (err) {
+                    logger.debug("Failed to fetch all configmanagement", err);
+                    res.status(500).send("Failed to fetch all configmanagement");
+                    return;
+                }
+                res.send(list);
+                return;
+            });
+        });
+    });
+
+    app.get('/d4dMasters/organization/:orgId/configmanagement/list', function(req, res) {
+        masterUtil.getAllCongifMgmtsForOrg(req.params.orgId, function(err, list) {
+            if (err) {
+                logger.debug("Failed to fetch all configmanagement", err);
+                res.status(500).send("Failed to fetch all configmanagement");
+                return;
+            }
+            res.send(list);
+            return;
+        });
+    });
+
+    app.get('/d4dMasters/configmanagement/:anId', function(req, res) {
+        if (!req.params.anId) {
+            res.status(400).send({
+                message: "Invalid Config Management Id"
+            });
+            return;
+        }
+        masterUtil.getCongifMgmtsById(req.params.anId, function(err, data) {
+            if (err) {
+                logger.debug("Failed to fetch all configmanagement", err);
+                res.status(500).send("Failed to fetch all configmanagement");
+                return;
+            }
+            if (!data) {
+                res.send(404, "No ConfigManagement Found.");
+                return;
+            }
+            res.send(data);
+            return;
+        });
+    });
+
+    app.get('/d4dMasters/env/:anId', function(req, res) {
+        logger.debug("Entered to env");
+        masterUtil.getEnvironmentName(req.params.anId, function(err, data) {
+            if (err) {
+                logger.debug("Failed to fetch  Environment", err);
+                res.status(500).send("Failed to fetch  Environment");
+                return;
+            }
+            if (!data) {
+                res.send(404, "No Environment Found.");
+                return;
+            }
+            res.send(data);
+            return;
+        });
+    });
+
+    app.get('/d4dMasters/project/:anId', function(req, res) {
+        logger.debug("Entered to Project");
+        masterUtil.getParticularProject(req.params.anId, function(err, data) {
+            if (err) {
+                logger.debug("Failed to fetch  Environment", err);
+                res.status(500).send("Failed to fetch  Environment");
+                return;
+            }
+            if (!data) {
+                res.send(404, "No Environment Found.");
+                return;
+            }
+            res.send(data);
+            return;
+        });
+    });
+
+    app.get('/d4dMasters/projectname/:anId', function(req, res) {
+        logger.debug("Entered to Project");
+        masterUtil.getProjectName(req.params.anId, function(err, data) {
+            if (err) {
+                logger.debug("Failed to fetch  Environment", err);
+                res.status(500).send("Failed to fetch  Environment");
+                return;
+            }
+            if (!data) {
+                res.send(404, "No Environment Found.");
+                return;
+            }
+            res.send(data);
+            return;
+        });
+    });
+
+    app.get('/d4dMasters/docker/:anId', function(req, res) {
+        logger.debug("Entered to Project");
+        masterUtil.getDockerById(req.params.anId, function(err, data) {
+            if (err) {
+                logger.debug("Failed to fetch  Docker", err);
+                res.status(500).send("Failed to fetch  Docker");
+                return;
+            }
+            if (!data.length) {
+                res.send(404, "No Docker Found.");
+                return;
+            }
+            res.send(data[0]);
+            return;
+        });
+    });
+
+    app.post('/d4dMasters/project/:anId/appdeploy/appName/update', function(req, res) {
+        logger.debug("Updating appName in Project.");
+        var appName = req.body.appName;
+        var appDescription = req.body.description;
+        var projectId = req.params.anId;
+        masterUtil.updateProject(projectId, appName, function(err, data) {
+            if (err) {
+                logger.debug("Failed to update Project with repo.");
+                //res.status(500).send("Failed to update Project with repo.");
+            }
+            if (data) {
+                res.status(200).send("Updated Project with repo.");
+            }
+        });
+    });
+
+    app.get('/d4dMasters/org/:orgId/templateType/:templateType/templates', function(req, res) {
+        masterUtil.getTemplatesByOrgAndTemplateType(req.params.orgId, req.params.templateType, function(err, templates) {
+            if (err) {
+                logger.debug("Error getting templates", err);
+                res.status(500).send({
+                    "errorCode": 500,
+                    "message": "Error getting templates"
+                });
+                return;
+            }
+            res.send(templates);
+            return;
+        });
+    });
+
+    // List image tags w.r.t. docker repo and image
+    app.get('/d4dMasters/docker/:repository/:image/tags', function(req, res) {
+        logger.debug("Called docker image tags.");
+        var options_auth = {};
+        client = new Client(options_auth);
+        var dockerUrl = "https://registry.hub.docker.com/v1/repositories/" + req.params.repository + "/" + req.params.image + "/tags";
+        client.registerMethod("jsonMethod", dockerUrl, "GET");
+        var reqSubmit = client.methods.jsonMethod(function(data, response) {
+            //var json = parser.toJson(data);
+            if (util.isArray(data)) {
+                res.send(data);
+                return;
+            } else {
+                res.status(404).send("Docker Image not found.");
+                return;
+            }
+        });
+    });
+
+    app.get('/d4dMasters/organization/:orgId/repositoryServer/list', function(req, res) {
+        var jsonData= {
+            orgId: req.params.orgId,
+            nexusId:'26',
+            dockerId:'18'
+        };
+        async.parallel({
+                server:function(callback) {
+                    masterUtil.getServerDetails(jsonData, callback)
+                }
+            },
+            function(err, results) {
+                if (err)
+                    res.status(500).send("Internal Server Error");
+                else if (!results)
+                    res.status(400).send("Data is not available for Organization " + req.params.orgId);
+                else
+                    res.status(200).send(results);
+            }
+        );
+    });
+
+    // List image tags w.r.t. docker repo and image
+    // For community image send repository= library
+    app.get('/d4dMasters/docker/:dockerId/repository/:repository/image/:image/tags', function(req, res) {
+        masterUtil.getDockerById(req.params.dockerId, function(err, docker) {
+            if (err) {
+                logger.debug("Failed to fetch  Docker", err);
+            }
+            logger.debug("docker: ",JSON.stringify(docker));
+            if (docker && docker.length) {
+                var options_auth = {
+                    user: docker[0].dockeruserid,
+                    password: docker[0].dockerpassword
+                };
+                client = new Client(options_auth);
+                var dockerUrl = "https://registry.hub.docker.com/v1/repositories/" + req.params.repository + "/" + req.params.image + "/tags";
+                client.registerMethod("jsonMethod", dockerUrl, "GET");
+                var reqSubmit = client.methods.jsonMethod(function(data, response) {
+                    if (util.isArray(data)) {
+                        res.send(data);
+                        return;
+                    } else {
+                        res.status(404).send("Docker Image not found.");
+                        return;
+                    }
+                });
+            } else {
+                var options_auth = {};
+                client = new Client(options_auth);
+                var dockerUrl = "https://registry.hub.docker.com/v1/repositories/" + req.params.repository + "/" + req.params.image + "/tags";
+                client.registerMethod("jsonMethod", dockerUrl, "GET");
+                var reqSubmit = client.methods.jsonMethod(function(data, response) {
+                    if (util.isArray(data)) {
+                        res.send(data);
+                        return;
+                    } else {
+                        res.status(404).send("Docker Image not found.");
+                        return;
+                    }
+                });
+            }
+        });
+    });
+
+}
diff --git a/server/app/routes/v1.0/routes_d4dMastersCICD.js b/server/app/routes/v1.0/routes_d4dMastersCICD.js
new file mode 100644
index 000000000..a6f167e50
--- /dev/null
+++ b/server/app/routes/v1.0/routes_d4dMastersCICD.js
@@ -0,0 +1,517 @@
+/*
+Copyright [2016] [Relevance Lab]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
+// This file act as a Controller which contains Settings related all end points.
+
+var d4dModel = require('_pr/model/d4dmasters/d4dmastersmodel.js');
+var d4dModelNew = require('_pr/model/d4dmasters/d4dmastersmodelnew.js');
+var usersDao = require('_pr/model/users.js');
+var fileIo = require('_pr/lib/utils/fileio');
+var uuid = require('node-uuid');
+var configmgmtDao = require('_pr/model/d4dmasters/configmgmt.js');
+var Chef = require('_pr/lib/chef');
+var Curl = require('_pr/lib/utils/curl.js');
+var appConfig = require('_pr/config');
+var logger = require('_pr/logger')(module);
+var childProcess = require('child_process');
+var exec = childProcess.exec;
+var masterUtil = require('_pr/lib/utils/masterUtil.js');
+var blueprintsDao = require('_pr/model/dao/blueprints');
+var errorResponses = require('./error_responses.js');
+var bcrypt = require('bcryptjs');
+var authUtil = require('_pr/lib/utils/authUtil.js');
+var Cryptography = require('_pr/lib/utils/cryptography');
+var Client = require('node-rest-client').Client;
+var cryptoConfig = appConfig.cryptoSettings;
+var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password);
+var waitForPort = require('wait-for-port');
+var parser = require('xml2json');
+var util = require('util');
+var Task = require('_pr/model/classes/tasks/tasks.js');
+var async = require('async');
+var	appDeployPipelineService = require('_pr/services/appDeployPipelineService');
+
+
+module.exports.setRoutes = function(app) {
+
+    //app.all('/d4dMasters/*', sessionVerification);
+
+    
+
+    app.get('/d4dMastersCICD/readmasterjsonnew/:id', function(req, res) {
+        logger.debug("Enter get() for /d4dMastersCICD/readmasterjsonnew/%s", req.params.id);
+//        logger.debug("Logged in user: ", );
+        logger.debug("incomming id: ", req.params.id);
+        var loggedInUser = 'superadmin';
+        masterUtil.getLoggedInUser(loggedInUser, function(err, anUser) {
+            if (err) {
+                res.status(500).send("Failed to fetch User.");
+                return;
+            }
+            if (!anUser) {
+                res.status(500).send("Invalid User.");
+                return;
+            }
+            if (anUser.orgname_rowid[0] === "") {
+                // For Org
+                masterUtil.getAllActiveOrg(function(err, orgList) {
+                    logger.debug("got org list ==>", JSON.stringify(orgList));
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    }
+                    if (orgList.length === 0 && req.params.id === '21') {
+                        d4dModelNew.d4dModelMastersTeams.find({
+                            id: "21"
+                        }, function(err, data) {
+                            if (err) {
+                                logger.error("Failed to fetch Team.");
+                            }
+                            res.send(data);
+                        });
+                    } else if (req.params.id === '1') {
+                        res.send(orgList);
+                        return;
+                    } else if (req.params.id === '2') {
+                        // For BusinessGroup
+                        masterUtil.getBusinessGroups(orgList, function(err, bgList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch BG.');
+                            }
+                            res.send(bgList);
+                            return;
+                        });
+                    } else if (req.params.id === '3') {
+                        // For Environment
+                        masterUtil.getEnvironments(orgList, function(err, envList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch ENV.');
+                            }
+                            res.send(envList);
+                            return;
+                        });
+                    } else if (req.params.id === '4') {
+                        // For Projects
+                        masterUtil.getProjects(orgList, function(err, projectList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Project.');
+                            }
+                            res.send(projectList);
+                            return;
+                        })
+                    } else if (req.params.id === '10') {
+                        // For ConfigManagement
+                        masterUtil.getCongifMgmts(orgList, function(err, configMgmtList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch ConfigManagement.');
+                            }
+                            res.send(configMgmtList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '18') {
+                        // For Docker
+                        logger.debug("Id for docker: ", req.params.id);
+                        masterUtil.getDockers(orgList, function(err, dockerList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Dockers.');
+                            }
+                            res.send(dockerList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '17') {
+                        // For Template
+                        logger.debug("Id for template: ", req.params.id);
+                        masterUtil.getTemplates(orgList, function(err, templateList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Template.');
+                            }
+                            res.send(templateList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '16') {
+                        // For Template
+                        logger.debug("Id for templateType: ", req.params.id);
+                        masterUtil.getTemplateTypes(orgList, function(err, templateList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch TemplateType.');
+                            }
+                            res.send(JSON.stringify(templateList));
+                            return;
+                        });
+                    } else if (req.params.id === '19') {
+                        // For ServiceCommand
+                        masterUtil.getServiceCommands(orgList, function(err, serviceCommandList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch ServiceCommand.');
+                            }
+                            res.send(serviceCommandList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '20') {
+                        // For Jenkins
+                        masterUtil.getJenkins(orgList, function(err, jenkinList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Jenkins.');
+                            }
+                            //res.send(jenkinList);
+			                var hygProp = '';
+                            if(jenkinList[0]){
+                                hygProp += 'jenkins.servers[0]=' + jenkinList[0].jenkinsurl + '\n';
+                                hygProp += 'jenkins.username=' + jenkinList[0].jenkinsusername + '\n';
+                                hygProp += 'jenkins.apiKey=' + jenkinList[0].jenkinspassword + '\n';
+                            }
+                            res.send(hygProp);
+                            return;
+                        });
+
+                    } else if (req.params.id === '27') {
+                        // For Jenkins
+                        masterUtil.getBitbucket(orgList, function(err, bitbucketList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Bitbucket.');
+                            }
+		                  //res.send("test\ntest");
+                          var hygProp = '';
+                            if(bitbucketList[0]){
+                              hygProp += 'git.username=' + bitbucketList[0].bitbucketusername + '\n';
+                              hygProp += 'git.password=' + bitbucketList[0].bitbucketpassword + '\n';
+                            }
+                            res.send(hygProp);
+                            //res.send(bitbucketList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '28') {
+                        // For Octopus
+                        masterUtil.getOctopus(orgList, function(err, octopusList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Octopus.');
+                            }
+			             var hygProp = '';
+                            if(octopusList[0]){
+                              hygProp += 'octopus.url=' + octopusList[0].octopusurl + '\n';
+                              hygProp += 'octopus.apiKey=' + octopusList[0].octopuskey + '\n';
+                            }
+                            res.send(hygProp);
+                            //res.send(octopusList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '29') {
+                        // For Functional Test
+                        logger.debug('Yippeee....');
+                        masterUtil.getFunctionalTest(orgList, function(err, functionaltestList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Functional Test.');
+                            }
+                            logger.debug(functionaltestList);
+                            var functionalProp = '';
+                            if(functionaltestList[0]){
+                              functionalProp += 'sbux.url=' + functionaltestList[0].functionaltesturl + '\n';
+                              functionalProp += 'sbux.days=' + functionaltestList[0].functionaltestdays + '\n';
+                            }
+                            res.send(functionalProp);
+                            //res.send(octopusList);
+                            return;
+                        });
+
+                    }
+                    else if (req.params.id === '23') {
+                        // For Jira
+                        logger.debug("Entering getJira");
+                        masterUtil.getJira(orgList, function(err, jiraList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Jira.');
+                            }
+			    var hygProp = '';
+			    if(jiraList[0]){
+			    hygProp += 'feature.jiraBaseUrl=' + jiraList[0].jiraurl + '\n';
+			    hygProp += 'feature.jiraCredentials=' + jiraList[0].jirakey + '\n';
+			    }
+                            res.send(hygProp);
+                            return;
+                        });
+
+                    } 
+                    else if (req.params.id === '6') {
+                        // For User Role
+                        masterUtil.getUserRoles(function(err, userRoleList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch UserRole.');
+                            }
+                            res.send(userRoleList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '7') {
+                        // For User
+                        masterUtil.getUsersForOrgOrAll(orgList, function(err, userList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch User.');
+                            }
+                            res.send(userList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '21') {
+                        // For Team
+                        masterUtil.getTeams(orgList, function(err, teamList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Team.');
+                            }
+                            res.send(teamList);
+                            return;
+                        });
+                    } else if (req.params.id === '25') {
+                        // For Puppet Server
+                        masterUtil.getPuppetServers(orgList, function(err, pList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Puppet Server.');
+                            }
+                            res.send(pList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '26') {
+                        // For Puppet Server
+                        masterUtil.getNexusServers(orgList, function(err, pList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Nexus Server.');
+                            }
+                            res.send(pList);
+                            return;
+                        });
+                    } else {
+                        logger.debug('nothin here');
+                        res.send([]);
+                    }
+                });
+
+                // For non-catalystadmin
+            } else {
+                logger.debug("incomming id: ", req.params.id);
+                // For Org
+                masterUtil.getOrgs(loggedInUser, function(err, orgList) {
+                    logger.debug("got org list: ", JSON.stringify(orgList));
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    } else if (req.params.id === '1') {
+                        res.send(orgList);
+                        return;
+                    } else if (req.params.id === '2') {
+                        // For BusinessGroup
+                        masterUtil.getBusinessGroups(orgList, function(err, bgList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch BG.');
+                            }
+                            res.send(bgList);
+                            return;
+                        });
+                    } else if (req.params.id === '3') {
+                        // For Environment
+                        masterUtil.getEnvironments(orgList, function(err, envList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch ENV.');
+                            }
+                            res.send(envList);
+                            return;
+                        });
+                    } else if (req.params.id === '4') {
+                        // For Projects
+                        masterUtil.getProjects(orgList, function(err, projectList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Project.');
+                            }
+                            res.send(projectList);
+                            return;
+                        })
+                    } else if (req.params.id === '10') {
+                        // For ConfigManagement
+                        masterUtil.getCongifMgmts(orgList, function(err, configMgmtList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch ConfigManagement.');
+                            }
+                            res.send(configMgmtList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '18') {
+                        // For Docker
+                        logger.debug("Id for docker: ", req.params.id);
+                        masterUtil.getDockers(orgList, function(err, dockerList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Dockers.');
+                            }
+                            res.send(dockerList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '17') {
+                        // For Template
+                        logger.debug("Id for template: ", req.params.id);
+                        masterUtil.getTemplates(orgList, function(err, templateList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Template.');
+                            }
+                            res.send(templateList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '16') {
+                        // For Template
+                        logger.debug("Id for templateType: ", req.params.id);
+                        masterUtil.getTemplateTypes(orgList, function(err, templateList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch TemplateType.');
+                            }
+                            res.send(JSON.stringify(templateList));
+                            return;
+                        });
+
+                    } else if (req.params.id === '19') {
+                        // For ServiceCommand
+                        masterUtil.getServiceCommands(orgList, function(err, serviceCommandList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch ServiceCommand.');
+                            }
+                            res.send(serviceCommandList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '20') {
+                        // For Jenkins
+                        masterUtil.getJenkins(orgList, function(err, jenkinList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Jenkins.');
+                            }
+                            res.send(jenkinList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '27') {
+                        // For Bitbucket
+                        masterUtil.getBitbucket(orgList, function(err, bitbucketList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch bitbucket.');
+                            }
+                            res.send(bitbucketList);
+                            return;
+                        });
+
+                    }else if (req.params.id === '28') {
+                        // For Octopus
+                        masterUtil.getOctopus(orgList, function(err, octopusList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Octopus.');
+                            }
+                            res.send(octopusList);
+                            return;
+                        });
+
+                    }else if (req.params.id === '29') {
+                        // For Functional Test
+                        masterUtil.getFunctionalTest(orgList, function(err, functionaltestList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Functional Test.');
+                            }
+                            var functionalProp = '';
+                            if(functionaltestList[0]){
+                              functionalProp += 'sbux.url=' + functionaltestList[0].functionaltesturl + '\n';
+                              functionalProp += 'sbux.days=' + functionaltestList[0].functionaltestdays + '\n';
+                            }
+                            res.send(functionalProp);
+                            //res.send(octopusList);
+                            return;
+                        });
+
+                    }
+                    else if (req.params.id === '23') {
+                        // For Jira
+                        masterUtil.getJira(orgList, function(err, jiraList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Jira.');
+                            }
+                            res.send(jiraList);
+                            return;
+                        });
+
+                    }else if (req.params.id === '6') {
+                        // For User Role
+                        masterUtil.getUserRoles(function(err, userRoleList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch UserRole.');
+                            }
+                            res.send(userRoleList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '7') {
+                        // For User
+                        masterUtil.getUsersForOrg(orgList, function(err, userList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch User.');
+                            }
+                            res.send(userList);
+                            return;
+                        });
+
+                    } else if (req.params.id === '21') {
+                        // For Team
+                        masterUtil.getTeams(orgList, function(err, teamList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Team.');
+                            }
+                            res.send(teamList);
+                            return;
+                        });
+                    } else if (req.params.id === '25') {
+                        // For Puppet Server
+                        masterUtil.getPuppetServers(orgList, function(err, pList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Puppet Server.');
+                            }
+                            res.send(pList);
+                            return;
+                        });
+                    } else if (req.params.id === '26') {
+                        // For Puppet Server
+                        masterUtil.getNexusServers(orgList, function(err, pList) {
+                            if (err) {
+                                res.status(500).send('Not able to fetch Nexus Server.');
+                            }
+                            res.send(pList);
+                            return;
+                        });
+                    } else {
+                        logger.debug('nothin here');
+                        res.send([]);
+                    }
+                });
+            }
+        });
+
+    });
+
+    
+
+}
+