Fix error when submitting changes when editing a competition.
Merge branch 'master' of https://github.com/codalab/codalab into dev
Added bundle metadata description to submission table. Fixes #318
Merge pull request #1 from csrampey/ux

Added bundle metadata description to submission table. Fixes #318
Merge pull request #338 from csrampey/master

Added bundle metadata description to submission table. Fixes #318
Merge branch 'master' into dev
Updating.
Merge branch 'umaster' into clean_master

Conflicts:
	.travis.yml
Enhanced (but commented out travis file).
Travis cleanup.
Added in search for competitions.
updated search results.
refactoring search results to be clear.
Undoing unnecessary changes.
Cleaned up untracked files and updated .gitignore.
Merge branch 'master' into clean_search
added calendar widget (needs color/styling update)
Adding HTML editing functions to competition edit page.

Conflicts:
	codalab/apps/web/forms.py
	codalab/apps/web/views.py
Added in leaderboard_management_mode for editing.

Conflicts:
	codalab/apps/web/forms.py
	codalab/apps/web/static/css/Main.css
	codalab/apps/web/views.py
Fixes for text area heights.