Merge branch 'master' of github.com:limijiaoyin/bvod-portal
Merge branch 'product' of github.com:limijiaoyin/bvod-portal
Merge branch 'product' of github.com:limijiaoyin/bvod-portal
Merge branch 'product' of github.com:limijiaoyin/bvod-portal
Merge branch 'product' of github.com:limijiaoyin/bvod-portal
Merge branch 'product' of github.com:limijiaoyin/bvod-portal
Merge branch 'product' of github.com:limijiaoyin/bvod-portal
Merge branch 'product' of github.com:limijiaoyin/bvod-portal
modified
	modified:   templates/video-card.html
	modified:   templates/videos.html
Merge branch 'product' of github.com:limijiaoyin/bvod-portal
Merge branch 'product' of github.com:limijiaoyin/bvod-portal
Merge branch 'product' of github.com:limijiaoyin/bvod-portal
Merge branch 'product' of github.com:limijiaoyin/bvod-portal
Merge branch 'product' of github.com:limijiaoyin/bvod-portal
Merge branch 'master' of github.com:limijiaoyin/bvod-portal
Merge branch 'master' of github.com:limijiaoyin/bvod-portal
Merge branch 'master' of github.com:limijiaoyin/bvod-portal
Merge branch 'master' of github.com:limijiaoyin/bvod-portal
Merge pull request #174 from wangbailin/master

search
Merge pull request #182 from wangbailin/master

search