misc
Merge branch 'master' of https://github.com/vinnyguitar/mv-player

Conflicts:
	src/js/mv.player.js
bg