cleanup of help text for API
cleanup of help text for API
URL fix for deployed
fix token deleting
display lab sections nicer
fix course display (and therefore tests)
Merge branch 'deployed-2014'
Merge branch 'master' into api

Conflicts:
	api/urls.py