Merge "Revert "adding OAuth library""