Merge remote branch 'origin/master' into nekomimi

Conflicts:
	portal/query.py
	templates/video-detail.html
department detail
refine
Merge remote-tracking branch 'origin/nekomimi'

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