Ratings and reviews:
1.showing rating stars on resource widget.
2.showing stars on collection palyer.
3.added new aswer object data logs evetns.
Removed conflicts:
Removed conflicts  in ResourcePlayerMetadataView.java file
and gooru.css file
for Data log event new object added.
Conflicts has been removed..
new Json object has been added for Question type resources.
conflicts has been removed.
Merge pull request #196 from shivalinga/master

Ratings and reviews:
Merge pull request #197 from mitraj/dev-branch

"Additional tab added for resources or collections."
Added new message text.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Updated UI for My Classes.
Merge pull request #198 from anilgooru/dev-branch

Updated UI for My Classes.
"6.1.5 FE [System - Setting] Wrong error message is being displayed for Space in user name fixed."
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch-2
Merge pull request #199 from sravanthi1/dev-branch

6.1.5 FE [System - Setting] Wrong error message is being displayed for Space in user name Fixed.
"Modified Info UI and handled Null pointer exception."
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch