Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  Fixed Deactivate the "Reports" Tab in a class
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Implemented: UI and Logic for Logged out user for classes.
Merge pull request #227 from VinRudramurthy/dev-branch

Implemented Ratings in RP and implemented avg ratings in resource search.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  Implemented Ratings in RP and implemented search avg ratings.
  Profile page library no-folder level collections display implemented
  implemented api for Include Aggregator + Publisher in Search filters
  "link given for created username in players"
  "Reactivate the created usernames in search."
Merge pull request #228 from anilgooru/dev-branch

Implemented: UI and Logic for Logged out user for classes.
"Adding tags to resource from organize page."
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge pull request #229 from suryanarayanakb/dev-branch

Adding tags to resource from organize page.
Grade and Course logic implemented for profile page
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Updated class code and created event to display/hide create button
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  "Adding tags to resource from organize page."
Merge pull request #230 from chandrasekharv/dev-branch

Grade and Course logic implemented for profile page
Merge pull request #231 from anilgooru/dev-branch

Updated class code and created event to display/hide create button
Add Bio Button text changed.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	MessageProperties.java