Updated version number
Merge branch 'master' into votemanager

Conflicts:
	addons/sourcemod/scripting/gscramble.sp