Blub
Merge remote-tracking branch 'origin/master'

Conflicts:
	Editor/index.html
Del
Video & Interaktiv Test Epub
Epub Test
Clean Working Directory
Update todo
Add Hinweis
Merge branch 'master' into widgetBranch_Carsten

Conflicts:
	Editor/index.html
	Editor/js/main.js