UKIRT updates to zh.json
Language key added to files
Merge branch 'master' into language_switcher

Conflicts:
	app/lib/en.coffee