Fixed problems with old code clashing during login
Merge branch 'master' of https://github.com/RICJ2/CJ2