Merge remote-tracking branch 'upstream/master'

spring-hibernate4/pom.xml

@@ -172,7 +172,7 @@
 		<!-- Spring -->
 		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
 		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
-		<javassist.version>3.18.1-GA</javassist.version>
+		<javassist.version>3.19.0-GA</javassist.version>
 
 		<!-- persistence -->
 		<hibernate.version>4.3.8.Final</hibernate.version>

spring-security-login-and-registration/src/main/resources/.gitignore

@@ -0,0 +1 @@
+email.properties

spring-security-login-and-registration/src/main/resources/email.properties.sample

@@ -3,5 +3,5 @@ smtp.host=email-smtp.us-east-1.amazonaws.com
 smtp.port=465
 smtp.protocol=smtps
 smtp.username=AKIAJIKXZAQFFJDXI4VQ
-smtp.password=AjYQNjXVTalbpfRL37RYqyXEkyQAvmKFcUFQllfAsBLh
+smtp.password=
 support.email=eugen@baeldung.com