Added enable/disable and visibilty changes to the combat controls based on if the player is in combat
Merge branch 'master' of https://github.com/QRayarch/GDAPS1FINAL

Conflicts:
	Final Combat.v11.suo
	Final Combat/bin/Debug/Final Combat.exe
	Final Combat/bin/Debug/Final Combat.pdb
	Final Combat/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Final Combat/obj/Debug/Final Combat.csproj.FileListAbsolute.txt
	Final Combat/obj/Debug/Final Combat.csproj.GenerateResource.Cache
	Final Combat/obj/Debug/Final Combat.exe
	Final Combat/obj/Debug/Final Combat.pdb