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
add very basic outline for GfxAnimation
add test.php file for animation testing
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
adjust README in order to reflect new version
Merge branch 'release-0.5'
Merge branch 'demo' into develop
lost day
Merge branch 'develop' of git.mediadecision.lan:thomas.hummel/chameleon into hummel_develop

Conflicts:
	output/display.html