Merge remote-tracking branch 'origin/nekomimi'
Merge remote-tracking branch 'lucky/master'

Conflicts:
	templates/video-detail.html
Merge branch 'master' of github.com:limijiaoyin/bvod-portal
refine org
Merge branch 'master' of github.com:limijiaoyin/bvod-portal

Conflicts:
	portal/views.py
refine view-detail
save
Merge remote-tracking branch 'origin/nekomimi'

Conflicts:
	assets/css/video-detail.css
	portal/query.py
polish
refine
Merge remote-tracking branch 'origin/nekomimi'

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

Conflicts:
	portal/query.py
refine