Merge pull request #16 from exfm/dan-dev

Dan dev
progress on service hover tips
Merge branch 'dev' into maj-dev

Conflicts:
	html/player.html
Merge pull request #17 from exfm/maj-dev

Maj dev
Merge branch 'dev' into dan-dev