frontend
nightly build
pushing editor forward
editor continued
Merge branch 'develop' of git.mediadecision.lan:christoph.starkmann/chameleon into develop
pre-pull
Merge branch 'develop' of git.mediadecision.lan:christoph.starkmann/chameleon into develop
tgif
pre-pull
Merge branch 'develop' of git.mediadecision.lan:christoph.starkmann/chameleon into develop
pre-pull
Merge branch 'develop' of git.mediadecision.lan:christoph.starkmann/chameleon into develop
nightly build
lost day
Merge branch 'develop' of git.mediadecision.lan:thomas.hummel/chameleon into hummel_develop

Conflicts:
	output/display.html
add testing code for REST API
rename RESTCenter (:-P) to APIConnector
path workaround
enhance class (DELETE!) and minor cleanup
mostly svg2json and vice versa