.
Merge branch 'master' of https://github.com/HackworthCForge/SolForgeInventory

Conflicts:
	SolForgeInventory.v11.suo