Merge pull request #72 from lucknessbuaa/master

modify the jwplayer part
logo changed
Merge pull request #73 from wangbailin/master

logo changed
logo
Merge pull request #74 from wangbailin/master

logo
shortcut icon
Merge pull request #75 from wangbailin/master

shortcut icon
temp
Merge pull request #76 from wangbailin/master

temp
complate
Merge pull request #77 from wangbailin/master

complate
sync
Merge pull request #78 from wangbailin/master

sync
compress files
Merge remote branch 'hello/master'

Conflicts:
	assets/img/logo.png