Can render concrete multiple colors
Got units to group correctly, but still don't go to the correct factory
Merge branch 'master' of https://github.com/LegendaryZ/Colony

Conflicts:
	Colony/Colony.h
	Colony/Colony_2010.sdf
	Colony/Colony_2010.suo
	Colony/Colony_2010.v11.suo
	Colony/Game.cpp
	Colony/Game.h
	Colony/Render.h
	Colony/UnitManager.cpp
	Colony/Win32/Debug/Colony.exe
	Colony/Win32/Debug/Colony.ilk
	Colony/Win32/Debug/Colony.pdb
	Colony/Win32/Debug/Colony/CL.read.1.tlog
	Colony/Win32/Debug/Colony/CL.write.1.tlog
	Colony/Win32/Debug/Colony/Colony.lastbuildstate
	Colony/Win32/Debug/Colony/Colony.log
	Colony/Win32/Debug/Colony/Colony.obj
	Colony/Win32/Debug/Colony/Colony_manifest.rc
	Colony/Win32/Debug/Colony/Game.obj
	Colony/Win32/Debug/Colony/Render.obj
	Colony/Win32/Debug/Colony/UnitManager.obj
	Colony/Win32/Debug/Colony/cl.command.1.tlog
	Colony/Win32/Debug/Colony/link.command.1.tlog
	Colony/Win32/Debug/Colony/link.read.1.tlog
	Colony/Win32/Debug/Colony/link.write.1.tlog
	Colony/Win32/Debug/Colony/mt.command.1.tlog
	Colony/Win32/Debug/Colony/mt.read.1.tlog
	Colony/Win32/Debug/Colony/mt.write.1.tlog
	Colony/Win32/Debug/Colony/rc.command.1.tlog
	Colony/Win32/Debug/Colony/rc.read.1.tlog
	Colony/Win32/Debug/Colony/rc.write.1.tlog
	Colony/Win32/Debug/Colony/vc100.idb
	Colony/Win32/Debug/Colony/vc100.pdb
	bin/Win32/DXUT/Debug/DXUT.lib
	bin/Win32/DXUTOpt/Debug/DXUTOpt.lib
	bin/Win32/SampleComponents/Debug/SampleComponents.lib
	obj/Win32/DXUT/Debug/CL.read.1.tlog
	obj/Win32/DXUT/Debug/CL.write.1.tlog
	obj/Win32/DXUT/Debug/DXUT.lastbuildstate
	obj/Win32/DXUT/Debug/DXUT.obj
	obj/Win32/DXUT/Debug/DXUTDevice11.obj
	obj/Win32/DXUT/Debug/DXUTDevice9.obj
	obj/Win32/DXUT/Debug/DXUT_2010.log
	obj/Win32/DXUT/Debug/DXUTmisc.obj
	obj/Win32/DXUT/Debug/Lib-link.read.1.tlog
	obj/Win32/DXUT/Debug/Lib-link.write.1.tlog
	obj/Win32/DXUT/Debug/cl.command.1.tlog
	obj/Win32/DXUT/Debug/lib.command.1.tlog
	obj/Win32/DXUT/Debug/vc100.idb
	obj/Win32/DXUT/Debug/vc100.pdb
	obj/Win32/DXUTOpt/Debug/CL.read.1.tlog
	obj/Win32/DXUTOpt/Debug/CL.write.1.tlog
	obj/Win32/DXUTOpt/Debug/DXUTOpt.lastbuildstate
	obj/Win32/DXUTOpt/Debug/DXUTOpt_2010.log
	obj/Win32/DXUTOpt/Debug/DXUTcamera.obj
	obj/Win32/DXUTOpt/Debug/DXUTgui.obj
	obj/Win32/DXUTOpt/Debug/DXUTguiIME.obj
	obj/Win32/DXUTOpt/Debug/DXUTres.obj
	obj/Win32/DXUTOpt/Debug/DXUTsettingsdlg.obj
	obj/Win32/DXUTOpt/Debug/ImeUi.obj
	obj/Win32/DXUTOpt/Debug/Lib-link.read.1.tlog
	obj/Win32/DXUTOpt/Debug/Lib-link.write.1.tlog
	obj/Win32/DXUTOpt/Debug/SDKmesh.obj
	obj/Win32/DXUTOpt/Debug/SDKmisc.obj
	obj/Win32/DXUTOpt/Debug/SDKsound.obj
	obj/Win32/DXUTOpt/Debug/SDKwavefile.obj
	obj/Win32/DXUTOpt/Debug/cl.command.1.tlog
	obj/Win32/DXUTOpt/Debug/lib.command.1.tlog
	obj/Win32/DXUTOpt/Debug/vc100.idb
	obj/Win32/DXUTOpt/Debug/vc100.pdb
	obj/Win32/SampleComponents/Debug/CL.read.1.tlog
	obj/Win32/SampleComponents/Debug/CL.write.1.tlog
	obj/Win32/SampleComponents/Debug/CPUUsage.obj
	obj/Win32/SampleComponents/Debug/CPUUsageUI.obj
	obj/Win32/SampleComponents/Debug/ContactUI.obj
	obj/Win32/SampleComponents/Debug/HelpUI.obj
	obj/Win32/SampleComponents/Debug/Lib-link-cvtres.read.1.tlog
	obj/Win32/SampleComponents/Debug/Lib-link-cvtres.write.1.tlog
	obj/Win32/SampleComponents/Debug/SampleComponents.lastbuildstate
	obj/Win32/SampleComponents/Debug/SampleComponents_2010.log
	obj/Win32/SampleComponents/Debug/TaskMgrTBB.obj
	obj/Win32/SampleComponents/Debug/cl.command.1.tlog
	obj/Win32/SampleComponents/Debug/lib.command.1.tlog
	obj/Win32/SampleComponents/Debug/rc.command.1.tlog
	obj/Win32/SampleComponents/Debug/rc.read.1.tlog
	obj/Win32/SampleComponents/Debug/rc.write.1.tlog
	obj/Win32/SampleComponents/Debug/vc100.idb
	obj/Win32/SampleComponents/Debug/vc100.pdb