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.
LifeBoard Library Implementation
"Player changes updated for add resource"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/gin/AppInjector.java
	src/main/java/org/ednovo/gooru/client/gin/AppModule.java
	src/main/java/org/ednovo/gooru/shared/i18n/MessageProperties.java
	src/main/java/org/ednovo/gooru/shared/i18n/MessageProperties.properties
conflicts resolved - Message Properties String
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
"player ui changes updated for add functionality"
Standards Browse Science Option duplicate scenario handled
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge pull request #1076 from ssushma/dev-branch

Standards Browse Science Option duplicate scenario handled
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch