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: