recordings - player
Merge branch 'develop' of https://github.com/TangeloApps/slattery into develop

Conflicts:
	css/slattery.css