Show Video media.
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/store_detail.ejs
Show Video media.