動画をキーワードで検索できるように実装
Merge branch 'master' of https://github.com/sekine126/wse2014

Conflicts:
	app/assets/stylesheets/entries.css.less