Merging Luke and Willson's changes

1) Modify player.js
2) Modify background.js
3) Modify recorder.js