Local
Merge branch 'master' of https://github.com/AlincoRecoders/GearFoundry

Conflicts:
	GearFoundry/Foundry/FoundryActions.cs