rebase modification

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;
 }
 

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