fixed ngss issue
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #566 from nutan-gooru/dev-branch

fixed ngss issue in setting
Merge pull request #567 from mitraj/dev-branch

Assign popup static data modified.
"commented line in discover tooltip."
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch