fixed all visual studio 2010 project file conflicts