Normalize line endings
Merge branch 'master' of https://github.com/cpoulain/codalab

Conflicts:
	codalab/apps/jobs/models.py
	codalab/apps/jobs/tests.py
	codalab/apps/web/tasks.py
	codalab/apps/web/templates/web/index.html
	codalab/apps/web/views.py