EYETRACKER-164: Override Devise reset password
Merge remote-tracking branch 'origin/master'