Merge pull request #2520 from harikodamati/dev-branch

Navigation for edit task and pathways
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch