backup
终于可以播放视频了~~
	deleted:    assets/js/jwplayer.flash.swf
	deleted:    assets/js/jwplayer.html5.js
	deleted:    assets/js/jwplayer.js
Merge remote branch 'origin/master' into nekomimi

Conflicts:
	assets/js/video-detail.js
	portal/views.py
	templates/video-detail.html

	modified:   assets/css/index.css
	new file:   assets/css/org.css
	modified:   assets/css/video-detail.css
	new file:   assets/img/dislike.png
	new file:   assets/img/like.png
	new file:   assets/img/share.png
	modified:   assets/scss/lib/icon.scss
	new file:   assets/scss/org.scss
	modified:   assets/scss/video-detail.scss
	modified:   base/urls.py
	new file:   templates/org-grid.html
	new file:   templates/org-list.html
	modified:   templates/video-grid.html
	modified:   templates/video-list.html
detail
6