fixed audio player
Merge branch 'master' of github.com:couchtape/couchtapeapp
Merge branch 'master' of github.com:couchtape/couchtapeapp

Conflicts:
	client/tv/js/controller.js
Merge remote-tracking branch 'origin/master'