humans
added clientenv
Merge remote-tracking branch 'origin/master' into browserify

Conflicts:
	app/client/app.coffee