Merge pull request #394 from nutan-gooru/dev-branch

fixed After closing the login popup or flag popup the username is dea… …
added text in terms of condition
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch