Updated Feature: Password reset
Merge branch 'development'