modify the org part
Merge remote branch 'hello/master'

Conflicts:
	portal/views.py
modify the org part
Merge remote branch 'hello/master'

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

modify the org part
modify org function in views.py
Merge remote branch 'hello/master'
Merge pull request #4 from lucknessbuaa/master

modify the org function in views.py
Merge remote branch 'origin/master' into nekomimi

Conflicts:
	portal/query.py
	templates/video-detail.html
department detail