Added new api call for reset user email
Merge remote-tracking branch 'gooru/master'
Code changes and request url path changes in user reset email api call
Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
resolved conflicts
Implemented CORE-2011(Required "CollectionItemId" while creating Folder/Collection).
Merge remote-tracking branch 'gooru/master'
Updated CORE-2011
Fixed CORE-2011
Merge pull request #739 from skpcharles/master

Added support to delete comment for collaborator
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/...
Merge pull request #728 from vksvenkat/master

Added new api call for reset user email
Merge remote-tracking branch 'origin/master'
Implement API to Assign role for user
Revert "Implement API to Assign role for user"

This reverts commit 09f04a79f05409f9fb2face51b39ddf2d8cc3510.
Chages for CF migration