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
Video Management
- new jsp elements for video lists
Video Management
- new icons and dummy images
Service.props
Service jar
css for upload
Video Management
- upload css / jquery
Video Management
- main.css
Video Management
- sql tables
Merge branch 'dev-branch' of
https://github.com/lecture2go/plugins-sdk-6.2

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

Not required
Delete test.js

Not required
Delete main.js

delete
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
Update
Video Management
- jsp interface extended
Video Management
- new icons for video list