Merge remote-tracking branch 'upstream/master'

Conflicts:
	codalab/apps/web/templates/web/index.html
Merge branch 'master' of https://github.com/anjithpal/codalab