fix
Merge remote-tracking branch 'origin/suggestMF' into suggestMF

Conflicts:
	public/js/MFPlayerDemo.js
	views/video.ejs