commit for update
conflict
Service.props
Service jar
css for upload
Merge branch 'dev-branch' of
https://github.com/lecture2go/plugins-sdk-6.2

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