Upgrade antlr
Refactoring
Add user logins and oauth memberships