Merge pull request #1 from Snake2k/master

Pull it
Merge pull request #2 from Snake2k/master

tables added. login remains
rolled back
Revert "rolled back"

This reverts commit d79ae464c893751b0c261dfc35dd136ac19f30b0.