更改了logo

邓加原
Merge branch 'master' of git@github.com:djy4713/nlp.git

Conflicts:
	yuqing/WebRoot/HotSubject.jsp
	yuqing/WebRoot/LeaderSubject.jsp