Merge branch 'gh-pages'

Conflicts:
	assets/demo-mariano.json
add hack to play with vars
Merge branch 'master' into gh-pages