Merge branch '2.1_fix'

Conflicts:
	hockey.luac
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