Merge remote-tracking branch 'origin/master'

Conflicts:
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/Scripts/main.js
	SignalR 2.0 MoveShape Demo/C#/MoveShapeDemo/Scripts/main.js.map
	SignalR 2.0 MoveShape
Demo/C#/MoveShapeDemo/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Merge remote-tracking branch 'origin/master'

Conflicts:
	SignalR 2.0
MoveShape Demo/C#/MoveShapeDemo/Scripts/main.js
	SignalR 2.0 MoveShape
Demo/C#/MoveShapeDemo/Scripts/main.js.map
	SignalR 2.0
MoveShape
Demo/C#/MoveShapeDemo/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

just in