Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'gooru/master'
CORE-2147 : Vimeo resource type support in API
Merge branch 'master' of https://github.com/Gooru/Gooru-Core-API

Conflicts:

api/src/main/java/org/ednovo/gooru/domain/service/ScollectionServiceImpl.java
Add User Permissions/Roles
Fixed intentation
Fixed Intentation-2
Fixed Intentation-3
Merge remote-tracking branch 'gooru/master'
Merge pull request #800 from sheebans/master

CORE-2147 : Vimeo resource type support in API
Removed images from local storage after s3 upload
Merge pull request #806 from yamunaBQ/master

Fixed CORE-2106 for while edit an classpage itemType field missing
CORE-2182 Added properties on constantProperties for login event support.
CORE-2182 Changes made done _USER_LOGIN instead of AUTH_USER
Merge pull request #807 from anand1711/master

CORE-2182 Added properties on constantProperties for login event support...
Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'gooru/master'
Fixed null pointer exception in update collaborator service in  create User API
Merge pull request #805 from prakashraja89/master

Add User Permissions/Roles
Merge remote-tracking branch 'gooru/master'