Vishv dev

Changes based on feedback on 'Google SignIn' branch.
Same as above