Merge branch '2.1' into 2.2

src/main/java/de/thm/arsnova/controller/UserController.java

@@ -97,7 +97,7 @@ public class UserController extends AbstractController {
 		response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
 	}
 
-	@RequestMapping(value = { "/{username}" }, method = RequestMethod.DELETE)
+	@RequestMapping(value = { "/{username}/" }, method = RequestMethod.DELETE)
 	public void activate(
 			@PathVariable final String username,
 			final HttpServletRequest request,

src/main/java/de/thm/arsnova/services/UserService.java

@@ -424,7 +424,7 @@ public class UserService implements IUserService {
 	public DbUser deleteDbUser(String username) {
 		User user = getCurrentUser();
 		if (!user.getUsername().equals(username)
-				&& SecurityContextHolder.getContext().getAuthentication().getAuthorities()
+				&& !SecurityContextHolder.getContext().getAuthentication().getAuthorities()
 						.contains(new SimpleGrantedAuthority("ROLE_ADMIN"))) {
 			throw new UnauthorizedException();
 		}