Merge pull request #641 from shivalinga/dev-branch

DO-4799 bug has been fixed
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
DO-4702, DO-4813, DO-4814 issues has been fixed