demo

demo
Merge branch 'master' of https://github.com/elChapoSing/testcrossfilter

Conflicts:
	demo.response.json