Almost have CTF working, just mines and traps don't work yet
Merge branch 'master' of https://github.com/MCForge/MCForge-Vanilla-Redux

Conflicts:
	Server/Scripting.cs
	updater/obj/x86/Release/Updater.csproj.FileListAbsolute.txt
	updater/obj/x86/Release/Updater.exe
	updater/obj/x86/Release/Updater.pdb
Merging more
Merge branch 'master' of https://github.com/MCForge/MCForge-Vanilla-Redux

Conflicts:
	updater/obj/x86/Release/Updater.csproj.FileListAbsolute.txt
	updater/obj/x86/Release/Updater.exe
	updater/obj/x86/Release/Updater.pdb

Conflicts:
	updater/obj/x86/Release/Updater.csproj.FileListAbsolute.txt
	updater/obj/x86/Release/Updater.exe
	updater/obj/x86/Release/Updater.pdb