Add 2FA (patch originally written by CSM)
Compiled Version
Merge master into compiled