Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'gooru/master'
code optimization  in  create Flag API
Merge pull request #737 from skpcharles/master

code optimization in create Flag API
Implemented CORE-2011(Required "CollectionItemId" while creating Folder/Collection).
Merge remote-tracking branch 'gooru/master'
Updated CORE-2011
Fixed CORE-2011
Fixed issue in newly Created Folders are not displayed in Assign Collections pop up
Added support to  delete comment  for collaborator
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
Added param for drive email id