Merge pull request #850 from shivalinga/dev-branch

Google drive updates
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
null pointer exception has been handled.