- added password reset + password activation + view changes
merge commit