Joiner
url
add api.md
modify
Merge remote-tracking branch 'origin/Lixu-11.1' into gaoce-11-1

Conflicts:
	api.md
	ourplatform/views.py