added clientenv
gitignore
Merge remote-tracking branch 'origin/master' into chaplin

Conflicts:
	app/client/app.coffee