update demo page
update to new api
Merge branch 'gh-pages'

Conflicts:
	.gitignore