Merge branch 'sparql-integration' of https://github.com/pasqLisena/MediaFragPlayerDemo into sparql-integration

Conflicts:
	public/css/MFstyle.scss
	views/video.ejs