Merge branch 'development' into experimental

Conflicts:
	addons/sourcemod/scripting/freak_fortress_2.sp