matti: added reset password
Optimized imports
Refactorings
Merge remote-tracking branch 'origin/master'