local commit
local commit
Merge branch 'master' into DungLe_ResetPassword

Conflicts:
	pom.xml
	src/main/java/com/axonactive/win3/util/MailService.java
	src/main/resources/messages_en_US.properties
	src/main/resources/spring-config/send-mail.xml
Reset password
Reset password
merge