fix demo page address
Merge branch 'master' into tc