Json.Net
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestSilverlightControls.Web/ClientBin/TestSilverlightControls.xap
BuildDrop removed