update demo page
Update test pages
Merge branch 'master' into 1.2