Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Discover partner libraries tooltip popup updated
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Integrated API to the ratings UI
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Resolved conflicts

Conflicts:

src/main/java/org/ednovo/gooru/client/mvp/play/resource/body/ResourcePlayerMetadataView.ui.xml
Merge pull request #203 from ssushma/dev-branch

Updated the Media file upload to just send filename to the Save Image API
Resolved conflicts in RPMDV java and XML file.

Conflicts:

src/main/java/org/ednovo/gooru/client/mvp/play/resource/body/ResourcePlayerMetadataView.java

src/main/java/org/ednovo/gooru/client/mvp/play/resource/body/ResourcePlayerMetadataView.ui.xml
Merge pull request #201 from VinRudramurthy/dev-branch

Dev branch
Merge pull request #204 from ssushma/dev-branch

Reports tab enabled in classpage.
implemented  For broken links, include UI for this in player
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #205 from nutan-gooru/dev-branch

implemented  For broken links, include UI for this in player
"To set the General info details by using API"
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/search/SearchInfoWidget.java
Merge pull request #206 from mitraj/dev-branch

To set the General info details by using API
fixed oer css issue
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch