blockstacksuo and csproj

blockstacksuo and csproj
Merge remote-tracking branchpoop happens 'origin/master'

Conflicts:
	BlockStack.suo