DO-4843, DO-4702 Bugs has been fixed.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #708 from shivalinga/dev-branch

DO-4843, DO-4702 Bugs has been fixed.