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