Badges and Password Reset features

merging into master