Improved password reset token security.
Added check so non-activated users cannot log in.
Merge branch 'master' of https://github.com/InfectedLan/InfectedAPI