media player
Merge branch 'master' into ben

Conflicts:
	client/index.html
Media player queue complete
Merge branch 'ben'
need to merge in audio player