update
Merge remote-tracking branch 'origin/master'

Conflicts:
	SuperiorCrafting/Assemblies/SuperiorCraftingDLL.dll