5 commits

Author	SHA1	Message	Date
Tim Hobbs	862d03a684	Merge remote-tracking branch 'upstream/master'	2014-03-30 16:28:19 -07:00
Tim Hobbs	84eb555644	Cast updates	2014-03-30 16:26:16 -07:00
Luke Pulverenti	7dd0efdcc2	restored live tv playback in the web client	2014-03-30 12:49:40 -04:00
Luke Pulverenti	45bcd1b40a	change cast icon state appropriately	2014-02-23 15:35:58 -05:00
Luke Pulverenti	869717c745	added chromecast icon	2014-02-23 12:29:02 -05:00