Merge pull request #938 from Gooru/dev-branch

6.5 Stories implemented.
Merge pull request #940 from Gooru/dev-branch

Added missing file.
Merge pull request #942 from Gooru/dev-branch

Handled null pointer exceptions in stringUtil.java file
Merge pull request #946 from Gooru/dev-branch

Classpage and preview player not loading issues resolved
Merge pull request #1023 from Gooru/dev-branch

6.5 Stories implemented.
Merge pull request #1024 from Gooru/dev-branch

Added Tags Display Issue in Player - Resolved
Merge pull request #1034 from Gooru/dev-branch

6.5 Stories implemented.
Merge pull request #1043 from Gooru/dev-branch

6.5 Stories implemented.
Merge pull request #1055 from Gooru/dev-branch

Fixed issues and added new stories.
Add new messages
Merge remote-tracking branch 'upstream/master' into dev-branch

* upstream/master:
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  Minor UI and text changes
  Removed sharable and private conformation pop up.
  Media script has been implemented for players.
  Resource types have been changed from plural to singular.
  message changes
  4 new partner libraries initial setup
  "Make all login pop-ups / screens the same"
  Standards Browse Science Option duplicate scenario handled
  "player ui changes updated for add functionality"
  Fixed Issues: 1.navigation issue has been fixed. 2.view count issue has been fixed. 3.few details not diplaying on player home issue has been fixed. 4.showing avarage reaction issue has been fixed.
  conflicts resolved - Message Properties String
  "Player changes updated for add resource"
  Removed search type Link from filters.
  LifeBoard Library Implementation

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

Add new messages
Merge pull request #1084 from VinRudramurthy/dev-branch

Revert back search filter changes.
Message property file conflicts has been resolved.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/shared/i18n/MessageProperties.properties
Merge pull request #1085 from shivalinga/dev-branch

Message property file conflicts has been resolved.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch