modify the org-detail page
Merge remote branch 'hello/master'

Conflicts:
	portal/query.py
small changes
Merge remote branch 'hello/nekomimi'

Conflicts:
	portal/query.py
	templates/video-detail.html
sdfs
Merge remote branch 'hello/nekomimi'
modify the org part
Merge remote branch 'hello/master'

Conflicts:
	portal/query.py
pretty old days
Merge remote branch 'hello/nekomimi'

Conflicts:
	portal/query.py
Merge pull request #5 from lucknessbuaa/master

modfy the org-detail part