Password reset

Merging feature_branch:password_reset into branch:development.