fixed demos to demo
Merge branch 'peter_master' into jsversion