Breakout of help content; reformat FAQ and Glossary pages for consistency with site, using Christopher's guidelines.
Merge branch 'master' into docs
Changes for distributed execution and deployment automation
Merge branch 'docs' of https://github.com/willum070/codalab

Conflicts:
	codalab/apps/web/urls/help.py
Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	codalab/apps/web/templates/web/competitions/upload_competition.html
	codalab/apps/web/urls/help.py