Merge remote-tracking branch 'origin/custom-validation'

Conflicts:
	src/main/java/com/naturalprogrammer/spring/tutorial/domain/User.java

Author: naturalprogrammer

src/main/java/com/naturalprogrammer/spring/tutorial/domain/User.java

@@ -46,6 +46,7 @@ public static enum Role {
 	@Column(nullable = false, length = 250)
 	private String email;
 
+	
 	@NotBlank(groups = {SignUpValidation.class, UpdateValidation.class})
     @Size(max=100, groups = {SignUpValidation.class, UpdateValidation.class})
 	@Column(nullable = false, length = 100)