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

Conflicts:
	GearFoundry/Defaults/Rules.xml