Fixed up Ground AOE gun
Merge branch 'master' of https://github.com/kmiron/UDKGames

Conflicts:
	Development/Src/UDKProject.suo
	UDKGame/Content/GlobalProtectionSquad/GPS_FX.upk
	UDKGame/Saves/GPS_Save.bin
	UDKGame/Script/Core.u
	UDKGame/Script/Engine.u
	UDKGame/Script/GFxUI.u
	UDKGame/Script/GFxUIEditor.u
	UDKGame/Script/GameFramework.u
	UDKGame/Script/GlobalProtectionSquad.u
	UDKGame/Script/IpDrv.u
	UDKGame/Script/Manifest.txt
	UDKGame/Script/OnlineSubsystemGameCenter.u
	UDKGame/Script/OnlineSubsystemPC.u
	UDKGame/Script/OnlineSubsystemSteamworks.u
	UDKGame/Script/SubstanceAir.u
	UDKGame/Script/SubstanceAirEd.u
	UDKGame/Script/UDKBase.u
	UDKGame/Script/UTEditor.u
	UDKGame/Script/UTGame.u
	UDKGame/Script/UTGameContent.u
	UDKGame/Script/UnrealEd.u
	UDKGame/Script/WinDrv.u
Merge branch 'master' of https://github.com/kmiron/UDKGames

Conflicts:
	Development/Src/UDKProject.suo
	UDKGame/Content/GlobalProtectionSquad/GPS_FX.upk
	UDKGame/Saves/GPS_Save.bin
	UDKGame/Script/Core.u
	UDKGame/Script/Engine.u
	UDKGame/Script/GFxUI.u
	UDKGame/Script/GFxUIEditor.u
	UDKGame/Script/GameFramework.u
	UDKGame/Script/GlobalProtectionSquad.u
	UDKGame/Script/IpDrv.u
	UDKGame/Script/Manifest.txt
	UDKGame/Script/OnlineSubsystemGameCenter.u
	UDKGame/Script/OnlineSubsystemPC.u
	UDKGame/Script/OnlineSubsystemSteamworks.u
	UDKGame/Script/SubstanceAir.u
	UDKGame/Script/SubstanceAirEd.u
	UDKGame/Script/UDKBase.u
	UDKGame/Script/UTEditor.u
	UDKGame/Script/UTGame.u
	UDKGame/Script/UTGameContent.u
	UDKGame/Script/UnrealEd.u
	UDKGame/Script/WinDrv.u