Merge branch 'master' into irjudson

Conflicts:
	codalab/apps/web/static/foundation/css/codalab.css
	codalab/apps/web/templates/base.html
Merge branch 'master' into irjudson

Conflicts:
	codalab/apps/web/static/foundation/css/codalab.css
	codalab/apps/web/templates/base.html
First changes to move competition creation to it's own task.
resolve conflict
Working on leaderboard configuration for uploaded competition bundles.
Complex leaderboard implementation complete.
Merge branch 'master' into irjudson

Conflicts:
	codalab/apps/web/static/css/codalab.css
	codalab/apps/web/templates/web/my/_managed.html
Merge pull request #237 from codalab/irjudson

Advanced Competition Create