view & url
user bug
Merge remote-tracking branch 'origin/master' into gaoce-11-1
add index support
Joiner
url
add api.md
modify
api.md mdified
Merge remote-tracking branch 'origin/Lixu-11.1' into gaoce-11-1

Conflicts:
	api.md
	ourplatform/views.py
add support
Merge branch 'master' into gaoce-11-1
sort
first version
Merge remote-tracking branch 'origin/Lixu-11.1' into gaoce-11-1

Conflicts:
	ourplatform/views.py
void
Merge branch 'master' into gaoce-11-1

Conflicts:
	ourplatform/templates/ourplatform/index.html
no message
move index.html