Merge branch 'master' into resourcer-feature

Author: mojo9492

client/src/App.tsx

@@ -31,7 +31,7 @@ const App: React.FC = () => {
                                         path="/organization/:organizationId"
                                         component={OrganizationSettings}
                                     />
-                                    <Route path="/settings" component={UserSettings} />
+                                   <Route path="/settings" component={UserSettings} />
                                     <Route path="/" component={Home} />
                                 </Switch>
                             </main>

client/src/Users/UserApi.ts

@@ -32,7 +32,6 @@ export interface TsrUserSettings {
 }
 
 export type UserRole = "ADMIN" | "USER";
-
 export interface TsrUser {
     userId: string;
     username: string;