some player stuff
Merge branch 'master' of https://github.com/databrary/databrary

Conflicts:
	app/assets/directive/player.js