*Fixed Null Pointer Exception in getUser
*DO-4817 6.4 QA [PPP] Click on follower user's name, the page turns to Detective (gc888 account)
Merge pull request #303 from cyrilraja/master

DO-4817 6.4 QA [PPP] Click on follower user's name, the page turns to Detective (gc888 account)
Core-1105 Added update collection for publish (admin)
Merge remote-tracking branch 'gooru/master'

Conflicts:

api/src/main/java/org/ednovo/gooru/domain/service/CollectionServiceImpl.java
	gooru-
core/src/main/java/org/ednovo/gooru/core/constant/ConstantProperties.java
Merge pull request #302 from vksvenkat/master

Core-979 Related added event log feedback
Addedredirect support to send the google user to landing page.
Merge pull request #305 from skpcharles/master

Addedredirect support to send the google user to landing page.
Merge pull request #304 from vksvenkat/master

Core-979 Added event logs for collaborator
Merge pull request #306 from PurnimaGS/master

Core-1105 Added update collection for publish (admin)
*DO-4824 6.4 QA [My Collections] - For newly created user account permanent deleting of collection is not happening
Validated the uuid changed the my collections api  based on uuid or username
Merge pull request #308 from sheebans/master

Validated the uuid changed the my collections api  based on uuid or username
added license comment from UUID conditional check method
Merge pull request #309 from sheebans/master

added license comment from UUID conditional check method
Merge remote-tracking branch 'gooru/master'
Merge pull request #307 from cyrilraja/master

*DO-4824 6.4 QA [My Collections] - For newly created user account perman...
*Fixed , more changes on DO-4824
Merge remote-tracking branch 'gooru/master'
Revert "*Fixed , more changes on DO-4824"

This reverts commit 652ed708eff24950178378067fe9e98358a9a694.