reset password functionality
Merge branch 'users2cards' into develop