work on composers
Merge branch 'master' of github.com:myniva/weblounge-editor

Conflicts:
	proof-of-concept/composer.html
	proof-of-concept/css/composer.css
merged Basils-Ansatz (Composer grafisch abgrenzen)