Merge pull request #456 from ssushma/dev-branch

Email Text changes for profile page.
Merge pull request #458 from ssushma/dev-branch

Publisher and the Aggregator fields not populating in FE issue Resolved
Text encoding implemented for > and < symbols in OE response.
Data log event - encoding done for < and > in OE answer submit
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge pull request #459 from chandrasekharv/dev-branch

Text encoding for OE answer text in the player
Fixed text in message properties file.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  Data log event - encoding done for < and > in OE answer submit
  Text encoding implemented for > and < symbols in OE response.
  Publisher and the Aggregator fields not populating in FE issue Resolved
  Email Text changes for profile page.
  text message hided on api call

Conflicts:
	src/main/java/org/ednovo/gooru/shared/util/MessageProperties.java
Merge pull request #460 from anilgooru/dev-branch

Bugs fixes for 6.3 patch
clear filter on click of search button
Merge pull request #461 from nutan-gooru/dev-branch

clear filter on click of search button
Fixed : 500 error while playing collection from teach
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  clear filter on click of search button
Merge pull request #462 from anilgooru/dev-branch

Fixed : 500 error while playing collection from teach
"6.3 QA [my Classes] - When class drop down is displayed scroll down and the drop list moves to Libraries. Fixed"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch-2
"6.3 [Libraries] - The fancy drop down for RUSD and Partner Libraries moves along with the page on scrolling Fixed."
Merge pull request #463 from sravanthi1/dev-branch

6.3 QA [my Classes] - When class drop down is displayed scroll down and the drop list moves to Libraries And 6.3 [Libraries] - The fancy drop down for RUSD and Partner Libraries moves along with the page on scrolling Fixed .
clear author filter in collection player
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch