Merge remote-tracking branch 'origin/NEWMASTER' into NEWMASTER

Conflicts:
	HG_GameContent/hug/004.hug
	HG_GameContent/hug/013.hug