Commit3

More minor changes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	gamemode/cl_init.lua
	gamemode/player_class/newbase.lua
	gamemode/shared.lua