Merging done.
Jar merged.
Properties merged.
Merge branch 'master' of
https://github.com/lecture2go/plugins-sdk-6.2.git

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