YODO
Merge branch 'master' of https://github.com/UMLRoverHawkUI/ROS_Sharp

Conflicts:
	XmlRpcWin32/Debug/CL.read.1.tlog
	XmlRpcWin32/Debug/CL.write.1.tlog
	XmlRpcWin32/Debug/Callers.obj
	XmlRpcWin32/Debug/XmlRpcClient.obj
	XmlRpcWin32/Debug/XmlRpcDispatch.obj
	XmlRpcWin32/Debug/XmlRpcServer.obj
	XmlRpcWin32/Debug/XmlRpcServerConnection.obj
	XmlRpcWin32/Debug/XmlRpcServerMethod.obj
	XmlRpcWin32/Debug/XmlRpcSocket.obj
	XmlRpcWin32/Debug/XmlRpcSource.obj
	XmlRpcWin32/Debug/XmlRpcUtil.obj
	XmlRpcWin32/Debug/XmlRpcValue.obj
	XmlRpcWin32/Debug/XmlRpcWin32.lastbuildstate
	XmlRpcWin32/Debug/XmlRpcWin32.log
	XmlRpcWin32/Debug/XmlRpcWin32.write.1.tlog
	XmlRpcWin32/Debug/cl.command.1.tlog
	XmlRpcWin32/Debug/dllmain.obj
	XmlRpcWin32/Debug/link.command.1.tlog
	XmlRpcWin32/Debug/link.read.1.tlog
	XmlRpcWin32/Debug/link.write.1.tlog
	XmlRpcWin32/Debug/mt.command.1.tlog
	XmlRpcWin32/Debug/mt.read.1.tlog
	XmlRpcWin32/Debug/mt.write.1.tlog
	XmlRpcWin32/Debug/vc100.pdb
	XmlRpc_Wrapper/XmlRpcWin32.dll
	XmlRpc_Wrapper/XmlRpcWin32.exp
	XmlRpc_Wrapper/XmlRpcWin32.lib
	XmlRpc_Wrapper/XmlRpcWin32.pdb
Merge remote-tracking branch 'origin/master'

Conflicts:
	CompressedImageView/MainWindow.xaml
herp derp