start of pad control
Merge remote-tracking branch 'origin/master'

Conflicts:

	BlockStack/BlockStackContent/obj/x86/Debug/BlockStackContent.contentprojResolveAssemblyReference.cache
	BlockStack/BlockStackContent/obj/x86/Debug/ContentPipeline.xml