hardocde thumbnaila nd video for UCB pre-demo
Merge branch 'develop' of https://github.com/koemei/koemei-widget into develop

Conflicts:
	dist/koemei-widget.js
	src/koemei/templates/jade/newsfeed/newsfeed_highlight.jade
	src/koemei/templates/jade/player.jade
Merge branch 'develop' of https://github.com/koemei/koemei-widget into develop

Conflicts:
	dist/koemei-widget.js
	src/koemei/templates/jade/newsfeed/newsfeed_highlight.jade
	src/koemei/templates/jade/player.jade
Merge branch 'develop' of https://github.com/koemei/koemei-widget into develop

Conflicts:
	dist/koemei-widget.js
	src/koemei/templates/jade/player.jade