more done
Merge remote-tracking branch 'origin/master'

Conflicts:
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo.v12.suo
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/Default.html
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/MoveShapeDemo.csproj.user
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/Properties/PublishProfiles/bunnyrun.pubxml
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/Properties/PublishProfiles/bunnyrun.pubxml.user
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/obj/Release/MoveShapeDemo.dll
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/obj/Release/MoveShapeDemo.pdb
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/obj/Release/Package/PackageTmp/Controller.html
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/obj/Release/Package/PackageTmp/Default.html
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/obj/Release/Package/PackageTmp/bin/MoveShapeDemo.dll
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/obj/Release/Package/PackageTmp/packages.config
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/packages.config
Merge remote-tracking branch 'origin/master'

Conflicts:
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo.v12.suo
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/Default.html
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/MoveShapeDemo.csproj.user
	SignalR 2.0 MoveShape
Demo/C#/MoveShapeDemo/Properties/PublishProfiles/bunnyrun.pubxml
	SignalR 2.0 MoveShape
Demo/C#/MoveShapeDemo/Properties/PublishProfiles/bunnyrun.pubxml.user
	SignalR 2.0 MoveShape
Demo/C#/MoveShapeDemo/obj/Release/MoveShapeDemo.dll
	SignalR 2.0 MoveShape
Demo/C#/MoveShapeDemo/obj/Release/MoveShapeDemo.pdb
	SignalR 2.0 MoveShape
Demo/C#/MoveShapeDemo/obj/Release/Package/PackageTmp/Controller.html
	SignalR 2.0 MoveShape
Demo/C#/MoveShapeDemo/obj/Release/Package/PackageTmp/Default.html
	SignalR 2.0 MoveShape
Demo/C#/MoveShapeDemo/obj/Release/Package/PackageTmp/bin/MoveShapeDemo.dll
	SignalR 2.0 MoveShape
Demo/C#/MoveShapeDemo/obj/Release/Package/PackageTmp/packages.config
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/packages.config