Video Management
- merged
Video Management
- merging
Merging changes
Merge branch 'master' of https://github.com/lecture2go/plugins-sdk-6.2

Conflicts:
	portlets/lecture2go-portlet/docroot/WEB-INF/src/service.properties