sekhar-added google authentication
sekhar-conflicts resolved