Conflicts fixed
Fixed
Translation added
fix ui
Fixed
Translations fixed
Merge pull request #1371 from matiaspando/error/informPasswordNotMatching

Error/inform password not matching