Merge remote-tracking branch 'upstream/master' into localMaster

Conflicts:
	tgstation.dme
Icons updated after item insertion.