Implemented CORE-1236(In GAT in get Assignments API add the assignment no,collection title,collection creator fields and search filters).
Merge remote-tracking branch 'gooru/master'
Implemented Changes to CORE-1236(In GAT in get Assignments API add the assignment no,collection title,collection creator fields and search filters)
Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'gooru/master'
Content.hbm.xml - cluster_uid, is_representative fields added in resource
Merge pull request #575 from cyrilraja/master

* Fixed DO-5479 On deletion of reviews the # reviews is not reflecting t...
Merge pull request #576 from rishwanthavr/master

Content.hbm.xml - cluster_uid, is_representative fields added in resourc...
Implemented CORE-1617(Upgraded hibernate to the latest version in gooru-api module).
changed the resourcetype for shelf
Implemented CORE-1236 (In GAT in get Assignments API add the assignment no,collection title,collection creator fields and search filters)
Fixed Conflict

Conflicts:
	gooru-
core/src/main/java/org/ednovo/gooru/core/constant/ParameterProperties.java
Merge pull request #559 from saravanab/master

Implemented CORE-1236(In GAT in get Assignments API add the assignment n...
Merge remote-tracking branch 'gooru/master'
upgraded bonecp version
Merge pull request #578 from sheebans/master

upgraded bonecp version
Merge remote-tracking branch 'gooru/master'
changed the bonecp version
Merge remote-tracking branch 'gooru/master'
added hibernate cache support for organization settings