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

Conflicts:
	views/partials/hotspots.ejs
Merge branch 'hotspot' of https://github.com/pasqLisena/MediaFragPlayerDemo into hotspot