Line endings normalization
Merge branch 'master' into production
Ongoing fixes for previous line endings -- avoiding resetting the whole repo at once.
Merge branch 'master' into production
Merge branch 'master' into production
Normalize line-endings
Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Increased read timeout from default 60 to 1200 seconds.
Merge branch 'umaster' into uproduction

Conflicts:
	codalab/config/templates/nginx.conf
Updated timeouts; removed prints.