Merge branch 'master' of https://github.com/pasqLisena/MediaFragPlayerDemo

Conflicts:
	js/MFPlayerDemo.js