* Fix Notice in mails
* Reset password in modal 1/2
Merge remote-tracking branch 'origin/next' into next