Merge pull request #529 from VinRudramurthy/dev-branch

Ratings are updated in real time if it got deleted.
resolved conflict in message properties
"Conflict resolved. Added new assign banner."
change css
Merge pull request #530 from mitraj/dev-branch

"Conflict resolved. Added new assign banner."
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
Merge pull request #534 from anilgooru/dev-branch

Fixed : New UI Issues for assignment progress.
When there are no assignments, a new UI added and pagination issues resolved, when a user deletes a assignment or adds an assignment.
When there are no assignments, a new UI added and pagination issues resolved, when a user deletes a assignment or adds an assignment.
When there are no assignments, a new UI added and pagination issues resolved, when a user deletes a assignment or adds an assignment.
Merge pull request #535 from ssushma/dev-branch

When there are no assignments, a new UI added and pagination issues resolved, when a user deletes a assignment or adds an assignment.
Drop list added with sort options in teach mode.
Merge pull request #536 from ssushma/dev-branch

Drop list added with sort options in teach mode.
Tag OER for resource - Reverted the code.