ups... / #5820

Erm. Well, I overviewed this one. Actually I am in holidays now(!) and can review some of the comments and requests. Sorry.
The demo-site is now online again. I have to upgrade the version, though.