added change password by email or username functionality and some UI messages
Merge remote-tracking branch 'origin/master'