come back to question mark
Merge branch 'master' into sparql-integration

Conflicts:
	controllers/database.js
	controllers/linkedTVconnection.js
	controllers/video.js
	database/video.db
	public/js/MFPlayerDemo.js
	views/video.ejs
Merge branch 'master' into sparql-integration

Conflicts:
	controllers/database.js
	controllers/linkedTVconnection.js
	controllers/video.js
	database/video.db
	public/js/MFPlayerDemo.js
	views/video.ejs