resolved conflict in message properties
change css
resolved conflict
Merge pull request #532 from nutan-gooru/dev-branch

resolved conflict in message properties
enable selected button on refersh
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #533 from nutan-gooru/dev-branch

enable selected button on refersh
Fixed UI Issues for assignment progress.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  enable selected button on refersh
  change css
  resolved conflict in message properties