added reset token to email links for the mobile app
Merge remote-tracking branch 'origin/master'