Updated quick small things

Adjusted some stuff.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/game/shared/template/sdk_usermessages.cpp