Add Criteria Table Demos
Merge branch 'master' into gh-pages-source
update