Merge pull request #872 from cmfcmf/override-fix

Fixed override path and reviewed all theme overrides, closes #805.
Fixed password recovery process when using your email adress. $uname thab only is available using the $userObj, closes #750.
Merge pull request #871 from cmfcmf/pw-recovery

Fixed password recovery process when using your email adress. $uname that only is available using the $userObj, closes #750.