remove all changes

before pull

src/main/java/org/springframework/samples/petclinic/controller/UserController.java

@@ -59,7 +59,8 @@ public class UserController extends WebSocketSender {
 
 	@InitBinder("user")
 	public void setAllowedFields(WebDataBinder dataBinder) {
-		dataBinder.setDisallowedFields(CommonAttribute.USER_ID);
+	//	dataBinder.setDisallowedFields(CommonAttribute.USER_ID,"roles");
+
 	}
 
 	Map<String, String> oauth2AuthenticationUrls = new HashMap<>();

src/main/java/org/springframework/samples/petclinic/dto/BaseDTO.java

@@ -39,4 +39,10 @@ public class BaseDTO implements Serializable {
 		return this.id == null;
 	}
 
+	@Override
+	public String toString() {
+		return "BaseDTO{" +
+			"id=" + id +
+			'}';
+	}
 }

src/main/java/org/springframework/samples/petclinic/dto/NamedDTO.java

@@ -50,4 +50,5 @@ public class NamedDTO extends BaseDTO {
 		return getName().equals(namedDTO.getName());
 	}
 
+
 }

src/main/java/org/springframework/samples/petclinic/dto/common/RoleDTO.java

@@ -11,4 +11,8 @@ import java.io.Serializable;
  */
 public class RoleDTO extends NamedDTO implements Serializable {
 
+	@Override
+	public String toString() {
+		return super.toString();
+	}
 }

src/main/resources/templates/users/userChangePasswordForm.html

@@ -27,7 +27,7 @@
       <div class="form-group">
         <label for="email">Email address</label>
         <input type="email" th:field="${user.email}" class="form-control input-lg" id="email" readonly>
-        <small id="emailHelp" class="form-text text-muted">We'll never share your emailConfiguration with anyone else.</small>
+        <small id="emailHelp" class="form-text text-muted">We'll never share your email with anyone else.</small>
       </div>
       <div class="form-group">
         <label for="oldPassword">Present password</label>