Analytics conflicts resolved
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
analytics issues resolved
Merge pull request #1680 from ssushma/dev-branch

Analytics conflicts resolved