Merge branch 'master' into development
Merge branch 'master' of https://github.com/thePlatform/thePlatform-video-manager