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.
"Make all login pop-ups / screens the same"
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Resource types have been changed from plural to singular.
Media script has been implemented for players.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1078 from mitraj/dev-branch

Make all login pop-ups / screens are the same
Merge pull request #1079 from chandrasekharv/dev-branch

LifeBoard implementation + 4 new libraries initial setup
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/shared/i18n/MessageProperties.java
	src/main/java/org/ednovo/gooru/shared/i18n/MessageProperties.properties
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