simple update demo page, big dark and unbeleivable changes coming soon later...
Merge branch 'master' into javatest