Pants and shoes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Leashed/Leashed/LeashedContent/obj/x86/Debug/ContentPipeline.xml
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 1cf3796399126011aa1e5c1f8745a19ff09c49fc.