mess
polish
Merge branch 'master' into nekomimi

Conflicts:
	assets/css/index.css
templates
Merge branch 'nekomimi' of github.com:limijiaoyin/bvod-portal into nekomimi
save
get rid of logo
Merge branch 'nekomimi' of github.com:limijiaoyin/bvod-portal into nekomimi
polish