Show game time in user's local timezone
Merge branch '2.1_fix'

Conflicts:
	hockey.luac
Increase number of bitrates displayed, and add 'kbps' to item title
Don't show date. Only show timezone if it's not local.
Don't show date. Only show timezone if it's not local.
Fix indentation
Fix indentation
Put time first so it aligns neatly.
Merge branch 'master' into pre-2.1
Merge branch 'no-time-mod' into pre-2.1

* no-time-mod:
  Add support for #EXT-X-KEY
Merge branch 'pre-2.1'

* pre-2.1:
  Add support for #EXT-X-KEY
Merge branch 'no-time-mod-pre-2.1' into no-time-mod

* no-time-mod-pre-2.1:
  Simplify key fix
Merge branch 'no-time-mod'

* no-time-mod:
  Simplify key fix
Update hockey.luac

Change user-agent to match iPad media player user agent
Merge remote-tracking branch 'MikE41/patch-1' into no-time-mod-pre-2.1

* MikE41/patch-1:
  Update hockey.luac