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.
Resource types have been changed from plural to singular.
Merge pull request #1080 from shivalinga/dev-branch

Media script has been implemented for players.
Removed sharable and private conformation pop up.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1081 from VinRudramurthy/dev-branch

Removed sharable and private conformation pop up.
Minor UI and text changes
Merge pull request #1082 from SurabhiSeetharam/dev-branch

Minor UI and text changes
Add new messages
Merge remote-tracking branch 'upstream/master' into dev-branch

* upstream/master:
Revert back search filter changes.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch