demo work
Merge remote-tracking branch 'origin/9-10-demo' into 9-10-demo

Conflicts:
	app/stylus/main.styl
	dev/1.main.js
	dev/1.main.js.map
	dev/main.js
	dev/main.js.map
	dev/styles/main.css