"keywords issue resolved"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/info/CollectionInfoTabPresenter.java
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge pull request #1121 from sravanthi1/dev-branch

"Standards API changes Updated in Collection Edit "