update lang
Merge remote-tracking branch 'origin/master'

Conflicts:
	lang/assets/nhg/lang/en_US.lang