Implemented CORE-2011(Required "CollectionItemId" while creating Folder/Collection).
Merge remote-tracking branch 'gooru/master'
Updated CORE-2011
Fixed CORE-2011
Resolved Conflicts

Conflicts:

api/src/main/java/org/ednovo/gooru/domain/service/ScollectionServiceImpl.java
Merge pull request #738 from saravanab/master

Implemented CORE-2011(Required "CollectionItemId" while creating Folder/...