Merge branch 'development'
Merge branch 'development'
Added translation about reset password
Merge branch 'master' into development