Better demo url label
update demo page
update to new api
add test server
Merge branch 'gh-pages'

Conflicts:
	.gitignore
Merge branch 'master' into develop

Conflicts:
	.gitignore