add demo
Merge branch 'master' into insCake

Conflicts:
	server/views/index.jade
	www/partials/new.html
	www/script/controllers.js
	www/script/transformers.js