UserPfofile password fixed
Merge pull request #53 from jimmy-sv/develop

add popup mes
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
Merge pull request #54 from jimmy-sv/develop

bug fix new
UserProfile password fix
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #55 from jimmy-sv/develop

add custom error mess for unsuccesfull login
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #56 from romanvintonyak/develop

UserProfile password fix
Database modified
Merge pull request #57 from olavin/develop

Database modified