UserPfofile password fixed
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	src/main/java/com/ss/atmlocator/service/UserService.java
	src/main/java/com/ss/atmlocator/validator/UserProfileValidator.java
UserProfile password fix
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #56 from romanvintonyak/develop

UserProfile password fix