Hack to make /csv/html continue to work
Merge branch 'master' into input-output

Conflicts:
	app.js