bugs
Merge branch 'master' of https://github.com/klickr/klickr-chrome into debugging

Conflicts:
	popups/app.js
Refined player
Merge pull request #41 from jyek/master

Refined player