Set keep-alive timeout
Merge remote-tracking branch 'origin/access_control'

Conflicts:
	app.js