Merge pull request #1849 from ssushma/dev-branch

Container clear issue handled
null pointer exception handled
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch