Merge branch 'refs/heads/master' into schema_update
new data schema
Merge branch 'refs/heads/master' into schema_update

Conflicts:
	demo/index.html
Merge branch 'refs/heads/schema_update'