From edbd661104cb1e76815b70fb2feb30c78f8841fe Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Tue, 30 Sep 2014 17:21:05 -0400
Subject: [PATCH] rebase modification

---
 UI/Common/UIxUserRightsEditor.m   | 3 +--
 UI/WebServerResources/GNUmakefile | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/UI/Common/UIxUserRightsEditor.m b/UI/Common/UIxUserRightsEditor.m
index 2208c50c2..8a6ee1166 100644
--- a/UI/Common/UIxUserRightsEditor.m
+++ b/UI/Common/UIxUserRightsEditor.m
@@ -237,7 +237,6 @@
     {
       response = [self responseWithStatus: 403
                                 andString: @"No such user."];
-      return response;
     }
     else 
     {
@@ -251,7 +250,7 @@
 
       response = [self jsCloseWithRefreshMethod: nil];
     }
-
+  }
   return response;
 }
 
diff --git a/UI/WebServerResources/GNUmakefile b/UI/WebServerResources/GNUmakefile
index 112e1fe6a..7ec9d633c 100644
--- a/UI/WebServerResources/GNUmakefile
+++ b/UI/WebServerResources/GNUmakefile
@@ -6,9 +6,9 @@ WEBSERVER_RESOURCE_DIRS = css fonts img js
 
 build-static-files:
 	@if [ -d bower_components ]; then \
-	  bower update; \
+	  bower update --allow-root; \
 	else \
-	  bower install; \
+	  bower install --allow-root; \
 	fi
 	( cd bower_components/underscore/ && npm run-script build )
 	grunt build