From 1515d52b13542f2edee54a704ba490cfb847b297 Mon Sep 17 00:00:00 2001
From: Udesh Kumar <udesh.kumar@relevancelab.com>
Date: Mon, 23 Jan 2017 14:48:27 +0530
Subject: [PATCH 1/3] removed api call on login page

---
 client/cat3/src/main.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/client/cat3/src/main.js b/client/cat3/src/main.js
index 2720b2867..5b0fde688 100644
--- a/client/cat3/src/main.js
+++ b/client/cat3/src/main.js
@@ -34,12 +34,6 @@ var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr','fireb
 angularApp.run(['$rootScope', 'auth', '$state', '$stateParams','$http','$window',
 	function ($rootScope, Auth, $state, $stateParams,$http) {
 		'use strict';
-		$http.get('/organizations/getTreeNew').success(function () {
-			// if(result.data && result.data.length >0){
-			// 	console.log(result);
-			// 	$window.location.href="/private/index.html#ajax/Settings/Dashboard.html";
-			// }
-		});
 		$rootScope.$on('$stateChangeStart', function (event, toState) {
 			//More function params: function (event, toState, toParams, fromState, fromParams)
 			function checkAuthentication() {

From d715dee9b5726b214227460b8cf7b79870997baf Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Mon, 23 Jan 2017 14:58:30 +0530
Subject: [PATCH 2/3] Resolve merge conflicts

---
 server/app/routes/v1.0/routes_authentication.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/app/routes/v1.0/routes_authentication.js b/server/app/routes/v1.0/routes_authentication.js
index 8126b3c92..dcb462e1c 100755
--- a/server/app/routes/v1.0/routes_authentication.js
+++ b/server/app/routes/v1.0/routes_authentication.js
@@ -364,7 +364,6 @@ module.exports.setRoutes = function(app) {
         if (req.session && req.session.user) {
             next();
         } else {
-            //checking for token authentication
             var token = req.headers[appConfig.catalystAuthHeaderName];
             if (token) {
                 AuthToken.findByToken(token, function(err, authToken) {

From b49a792d83a42d9cd5d26e7399a97973ad547257 Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Mon, 23 Jan 2017 15:12:23 +0530
Subject: [PATCH 3/3] Remove mandatory for Instance Username for CFT

---
 .../sections/dashboard/design/view/blueprintCreate.html     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
index 7db32927b..d075b12b7 100755
--- a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
+++ b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
@@ -535,9 +535,9 @@
                                     Configure Resource : {{key}}
                                  </accordion-heading>
                                  <div class="col-lg-6 col-md-6 margintop15">
-                                    <label for="cftUserName">Instance Username<span class="red">&nbsp;*</span>
-                                       <span ng-show="newBlueprintForm.cftUserName.$touched && newBlueprintForm.cftUserName.$invalid" class="inputValidationMsg">Required</span></label>
-                                    <input type="text" ng-model="bpCreate.newEnt.cftModelResources[key]" name="cftUserName" class="form-control" required/>
+                                    <label for="cftUserName">Instance Username<!--<span class="red">&nbsp;*</span>
+                                       <span ng-show="newBlueprintForm.cftUserName.$touched && newBlueprintForm.cftUserName.$invalid" class="inputValidationMsg">Required</span>--></label>
+                                    <input type="text" ng-model="bpCreate.newEnt.cftModelResources[key]" name="cftUserName" class="form-control"/>
                                  </div>
                                  <div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
                                     <span class="cursor pull-right">