Move PlatformCanvas and PlatformDevice from base/gfx to webkit/port. I left header files in the original locations that include the ones in the new location so I don't have to change all the includes in Chrome at once. These will be removed later.

I kept the names, indenting, and the namespaces the same for now. I will also be cleaning this up in separate passes. Review URL: http://codereview.chromium.org/11244 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5690 0039d316-1c4b-4281-b951-d872f2087c98
author: brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> 2008-11-19 18:52:38 +0000
committer: brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> 2008-11-19 18:52:38 +0000
commit: 6165b4070b7e3a2fd33efd0eb66043c86f61d8b2 (patch)
tree: d2f7f195c13274ca524d264dc34639e276805325
parent: 941ac7fca4afc89cb28ffa760f5a4a4ca077912c (diff)
download: chromium_src-6165b4070b7e3a2fd33efd0eb66043c86f61d8b2.zip
chromium_src-6165b4070b7e3a2fd33efd0eb66043c86f61d8b2.tar.gz
chromium_src-6165b4070b7e3a2fd33efd0eb66043c86f61d8b2.tar.bz2
51 files changed, 3242 insertions, 3046 deletions
diff --git a/DEPS b/DEPS
index 16bc98b..c71a27d 100644
--- a/DEPS
+++ b/DEPS
@@ -47,7 +47,11 @@ include_rules = [
   # For now, we allow ICU to be included by specifying "unicode/...", although
   # this should probably change.
   "+unicode",
-  '+testing'
+  "+testing",
+
+  # Allow anybody to include files from the "public" Skia directory in the
+  # webkit port. This is shared between the webkit port and Chrome.
+  "+webkit/port/platform/graphics/skia/public",
 ]
 
 
diff --git a/base/base_unittests.scons b/base/base_unittests.scons
index 61f9140..b8aafbc 100644
--- a/base/base_unittests.scons
+++ b/base/base_unittests.scons
@@ -124,7 +124,6 @@ input_files = [
     'gfx/native_theme_unittest.cc',
     'gfx/png_codec_unittest.cc',
     'gfx/rect_unittest.cc',
-    'gfx/vector_canvas_unittest.cc',
 ]
 
 if env['PLATFORM'] in ('posix', 'darwin'):
@@ -139,7 +138,6 @@ if env['PLATFORM'] in ('posix', 'darwin'):
 
       'watchdog_unittest.cc',
       'gfx/native_theme_unittest.cc',
-      'gfx/vector_canvas_unittest.cc',
   ]
   for remove in to_be_ported_files:
     input_files.remove(remove)
diff --git a/base/build/base_gfx.vcproj b/base/build/base_gfx.vcproj
index 22dc8b4..8b2bc64 100644
--- a/base/build/base_gfx.vcproj
+++ b/base/build/base_gfx.vcproj
@@ -122,10 +122,6 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\gfx\bitmap_platform_device_win.cc"
-			>
-		</File>
-		<File
 			RelativePath="..\gfx\bitmap_platform_device_win.h"
 			>
 		</File>
@@ -162,18 +158,10 @@
 			>
 		</File>
 		<File
-			RelativePath="..\gfx\platform_canvas_win.cc"
-			>
-		</File>
-		<File
 			RelativePath="..\gfx\platform_canvas_win.h"
 			>
 		</File>
 		<File
-			RelativePath="..\gfx\platform_device_win.cc"
-			>
-		</File>
-		<File
 			RelativePath="..\gfx\platform_device_win.h"
 			>
 		</File>
@@ -225,22 +213,6 @@
 			RelativePath="..\gfx\skia_utils.h"
 			>
 		</File>
-		<File
-			RelativePath="..\gfx\vector_canvas.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\gfx\vector_canvas.h"
-			>
-		</File>
-		<File
-			RelativePath="..\gfx\vector_device.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\gfx\vector_device.h"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/base/build/base_unittests.vcproj b/base/build/base_unittests.vcproj
index df3444b..3c75166 100644
--- a/base/build/base_unittests.vcproj
+++ b/base/build/base_unittests.vcproj
@@ -404,17 +404,9 @@
 				>
 			</File>
 			<File
-				RelativePath="..\gfx\platform_canvas_unittest.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\gfx\png_codec_unittest.cc"
 				>
 			</File>
-			<File
-				RelativePath="..\gfx\vector_canvas_unittest.cc"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/base/gfx/base_gfx.scons b/base/gfx/base_gfx.scons
index 748f13b..0af67c6 100644
--- a/base/gfx/base_gfx.scons
+++ b/base/gfx/base_gfx.scons
@@ -42,8 +42,6 @@ input_files = [
     'rect.cc',
     'size.cc',
     'skia_utils.cc',
-    'vector_canvas.cc',
-    'vector_device.cc',
 ]
 
 if env['PLATFORM'] in ('posix', 'darwin'):
@@ -53,23 +51,15 @@ if env['PLATFORM'] in ('posix', 'darwin'):
       'gdi_util.cc',
       'native_theme.cc',
       'skia_utils.cc',
-      'vector_canvas.cc',
-      'vector_device.cc',
   ]
   for remove in to_be_ported_files:
     input_files.remove(remove)
 
 if env['PLATFORM'] == 'win32':
   input_files.extend([
-      'bitmap_platform_device_win.cc',
-      'platform_canvas_win.cc',
-      'platform_device_win.cc',
   ])
 elif env['PLATFORM'] == 'posix':
   input_files.extend([
-      'bitmap_platform_device_linux.cc',
-      'platform_canvas_linux.cc',
-      'platform_device_linux.cc',
   ])
 
 env.ChromeStaticLibrary('base_gfx', input_files)
diff --git a/base/gfx/bitmap_platform_device.h b/base/gfx/bitmap_platform_device.h
index 1efa65c..7c25eb2 100644
--- a/base/gfx/bitmap_platform_device.h
+++ b/base/gfx/bitmap_platform_device.h
@@ -2,26 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Declare a platform-neutral name for this platform's bitmap device class
-// that can be used by upper-level classes that just need to pass a reference
-// around.
-
-#if defined(OS_WIN)
-#include "base/gfx/bitmap_platform_device_win.h"
-#elif defined(OS_MACOSX)
-#include "base/gfx/bitmap_platform_device_mac.h"
-#elif defined(OS_LINUX)
-#include "base/gfx/bitmap_platform_device_linux.h"
-#endif
-
-namespace gfx {
-
-#if defined(OS_WIN)
-typedef BitmapPlatformDeviceWin BitmapPlatformDevice;
-#elif defined(OS_MACOSX)
-typedef BitmapPlatformDeviceMac BitmapPlatformDevice;
-#elif defined(OS_LINUX)
-typedef BitmapPlatformDeviceLinux BitmapPlatformDevice;
-#endif
-
-}
+// TODO(brettw) this file should be removed and the includes changed to this
+// new location.
+#include "webkit/port/platform/graphics/skia/public/BitmapPlatformDevice.h"
diff --git a/base/gfx/bitmap_platform_device_linux.h b/base/gfx/bitmap_platform_device_linux.h
index 629fd1d..3db11cb 100644
--- a/base/gfx/bitmap_platform_device_linux.h
+++ b/base/gfx/bitmap_platform_device_linux.h
@@ -5,87 +5,8 @@
 #ifndef BASE_GFX_BITMAP_PLATFORM_DEVICE_LINUX_H_
 #define BASE_GFX_BITMAP_PLATFORM_DEVICE_LINUX_H_
 
-#include "base/gfx/platform_device_linux.h"
-#include "base/ref_counted.h"
-
-typedef struct _cairo_surface cairo_surface_t;
-
-// -----------------------------------------------------------------------------
-// Image byte ordering on Linux:
-//
-// Pixels are packed into 32-bit words these days. Even for 24-bit images,
-// often 8-bits will be left unused for alignment reasons. Thus, when you see
-// ARGB as the byte order you have to wonder if that's in memory order or
-// little-endian order. Here I'll write A.R.G.B to specifiy the memory order.
-//
-// GdkPixbuf's provide a nice backing store and defaults to R.G.B.A order.
-// They'll do the needed byte swapping to match the X server when drawn.
-//
-// Skia can be controled in skia/include/corecg/SkUserConfig.h (see bits about
-// SK_R32_SHIFT). For Linux we define it to be ARGB in registers. For little
-// endian machines that means B.G.R.A in memory.
-//
-// The image loaders are controlled in
-// webkit/port/platform/image-decoders/ImageDecoder.h (see setRGBA). These are
-// also configured for ARGB in registers.
-//
-// Cairo's only 32-bit mode is ARGB in registers.
-//
-// X servers commonly have a 32-bit visual with xRGB in registers (since they
-// typically don't do alpha blending of drawables at the user level. Composite
-// extensions aside.)
-//
-// We don't use GdkPixbuf because its byte order differs from the rest. Most
-// importantly, it differs from Cairo which, being a system library, is
-// something that we can't easily change.
-// -----------------------------------------------------------------------------
-
-namespace gfx {
-
-// -----------------------------------------------------------------------------
-// This is the Linux bitmap backing for Skia. We create a Cairo image surface
-// to store the backing buffer. This buffer is BGRA in memory (on little-endian
-// machines).
-//
-// For now we are also using Cairo to paint to the Drawables so we provide an
-// accessor for getting the surface.
-//
-// This is all quite ok for test_shell. In the future we will want to use
-// shared memory between the renderer and the main process at least. In this
-// case we'll probably create the buffer from a precreated region of memory.
-// -----------------------------------------------------------------------------
-class BitmapPlatformDeviceLinux : public PlatformDeviceLinux {
-  // A reference counted cairo surface
-  class BitmapPlatformDeviceLinuxData;
-
- public:
-  /// Static constructor. I don't understand this, it's just a copy of the mac
-  static BitmapPlatformDeviceLinux* Create(int width, int height,
-                                           bool is_opaque);
-
-  // Create a BitmapPlatformDeviceLinux from an already constructed bitmap;
-  // you should probably be using Create(). This may become private later if
-  // we ever have to share state between some native drawing UI and Skia, like
-  // the Windows and Mac versions of this class do.
-  //
-  // This object takes ownership of @data.
-  BitmapPlatformDeviceLinux(const SkBitmap& other,
-                            BitmapPlatformDeviceLinuxData* data);
-  virtual ~BitmapPlatformDeviceLinux();
-  BitmapPlatformDeviceLinux& operator=(const BitmapPlatformDeviceLinux& other);
-
-  // A stub copy constructor.  Needs to be properly implemented.
-  BitmapPlatformDeviceLinux(const BitmapPlatformDeviceLinux& other);
-
-  // Bitmaps aren't vector graphics.
-  virtual bool IsVectorial() { return false; }
-
-  cairo_surface_t* surface() const;
-
- private:
-  scoped_refptr<BitmapPlatformDeviceLinuxData> data_;
-};
-
-}  // namespace gfx
+// TODO(brettw) this file should be removed and the includes changed to this
+// new location.
+#include "webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceLinux.h"
 
 #endif  // BASE_GFX_BITMAP_PLATFORM_DEVICE_LINUX_H_
diff --git a/base/gfx/bitmap_platform_device_mac.h b/base/gfx/bitmap_platform_device_mac.h
index a008444..ff89741 100755
--- a/base/gfx/bitmap_platform_device_mac.h
+++ b/base/gfx/bitmap_platform_device_mac.h
@@ -5,91 +5,9 @@
 #ifndef BASE_GFX_BITMAP_PLATFORM_DEVICE_MAC_H__
 #define BASE_GFX_BITMAP_PLATFORM_DEVICE_MAC_H__
 
-#include "base/gfx/platform_device_mac.h"
-#include "base/ref_counted.h"
-
-namespace gfx {
-
-// A device is basically a wrapper around SkBitmap that provides a surface for
-// SkCanvas to draw into. Our device provides a surface CoreGraphics can also
-// write to. BitmapPlatformDeviceMac creates a bitmap using
-// CGCreateBitmapContext() in a format that Skia supports and can then use this
-// to draw text into, etc. This pixel data is provided to the bitmap that the
-// device contains so that it can be shared.
-//
-// The device owns the pixel data, when the device goes away, the pixel data
-// also becomes invalid. THIS IS DIFFERENT THAN NORMAL SKIA which uses
-// reference counting for the pixel data. In normal Skia, you could assign
-// another bitmap to this device's bitmap and everything will work properly.
-// For us, that other bitmap will become invalid as soon as the device becomes
-// invalid, which may lead to subtle bugs. Therefore, DO NOT ASSIGN THE
-// DEVICE'S PIXEL DATA TO ANOTHER BITMAP, make sure you copy instead.
-class BitmapPlatformDeviceMac : public PlatformDeviceMac {
- public:
-  // Factory function. The screen DC is used to create the bitmap, and will not
-  // be stored beyond this function. is_opaque should be set if the caller
-  // knows the bitmap will be completely opaque and allows some optimizations.
-  //
-  // The shared_section parameter is optional (pass NULL for default behavior).
-  // If shared_section is non-null, then it must be a handle to a file-mapping
-  // object returned by CreateFileMapping.  See CreateDIBSection for details.
-  static BitmapPlatformDeviceMac* Create(CGContextRef context,
-                                         int width,
-                                         int height,
-                                         bool is_opaque);
-
-  // Copy constructor. When copied, devices duplicate their internal data, so
-  // stay linked. This is because their implementation is very heavyweight
-  // (lots of memory and CoreGraphics state). If a device has been copied, both
-  // clip rects and other state will stay in sync.
-  //
-  // This means it will NOT work to duplicate a device and assign it to a
-  // canvas, because the two canvases will each set their own clip rects, and
-  // the resulting CoreGraphics drawing state will be unpredictable.
-  //
-  // Copy constucting and "=" is designed for saving the device or passing it
-  // around to another routine willing to deal with the bitmap data directly.
-  BitmapPlatformDeviceMac(const BitmapPlatformDeviceMac& other);
-  virtual ~BitmapPlatformDeviceMac();
-
-  // See warning for copy constructor above.
-  BitmapPlatformDeviceMac& operator=(const BitmapPlatformDeviceMac& other);
-
-  virtual CGContextRef GetBitmapContext();
-  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
-
-  virtual void DrawToContext(CGContextRef context, int x, int y,
-                             const CGRect* src_rect);
-  virtual bool IsVectorial() { return false; }
-  virtual void fixupAlphaBeforeCompositing() { };
-  
-  // Returns the color value at the specified location. This does not
-  // consider any transforms that may be set on the device.
-  SkColor getColorAt(int x, int y);
-
- protected:
-  // Reference counted data that can be shared between multiple devices. This
-  // allows copy constructors and operator= for devices to work properly. The
-  // bitmaps used by the base device class are already refcounted and copyable.
-  class BitmapPlatformDeviceMacData;
-
-  BitmapPlatformDeviceMac(BitmapPlatformDeviceMacData* data,
-                          const SkBitmap& bitmap);
-
-  // Flushes the CoreGraphics context so that the pixel data can be accessed
-  // directly by Skia. Overridden from SkDevice, this is called when Skia
-  // starts accessing pixel data.
-  virtual void onAccessBitmap(SkBitmap*);
-
-  // Data associated with this device, guaranteed non-null.
-  scoped_refptr<BitmapPlatformDeviceMacData> data_;
-
-  virtual void processPixels(int x, int y,
-                             int width, int height, 
-                             adjustAlpha adjustor);
-};
-
-}  // namespace gfx
+// TODO(brettw) this file should be removed and the includes changed to this
+// new location.
+#include "webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceMac.h"
 
 #endif  // BASE_GFX_BITMAP_PLATFORM_DEVICE_MAC_H__
 
diff --git a/base/gfx/bitmap_platform_device_win.h b/base/gfx/bitmap_platform_device_win.h
index fef7217..566e302 100644
--- a/base/gfx/bitmap_platform_device_win.h
+++ b/base/gfx/bitmap_platform_device_win.h
@@ -5,107 +5,9 @@
 #ifndef BASE_GFX_BITMAP_PLATFORM_DEVICE_WIN_H_
 #define BASE_GFX_BITMAP_PLATFORM_DEVICE_WIN_H_
 
-#include "base/gfx/platform_device_win.h"
-#include "base/ref_counted.h"
-
-namespace gfx {
-
-// A device is basically a wrapper around SkBitmap that provides a surface for
-// SkCanvas to draw into. Our device provides a surface Windows can also write
-// to. BitmapPlatformDeviceWin creates a bitmap using CreateDIBSection() in a
-// format that Skia supports and can then use this to draw ClearType into, etc.
-// This pixel data is provided to the bitmap that the device contains so that it
-// can be shared.
-//
-// The device owns the pixel data, when the device goes away, the pixel data
-// also becomes invalid. THIS IS DIFFERENT THAN NORMAL SKIA which uses
-// reference counting for the pixel data. In normal Skia, you could assign
-// another bitmap to this device's bitmap and everything will work properly.
-// For us, that other bitmap will become invalid as soon as the device becomes
-// invalid, which may lead to subtle bugs. Therefore, DO NOT ASSIGN THE
-// DEVICE'S PIXEL DATA TO ANOTHER BITMAP, make sure you copy instead.
-class BitmapPlatformDeviceWin : public PlatformDeviceWin {
- public:
-  // Factory function. The screen DC is used to create the bitmap, and will not
-  // be stored beyond this function. is_opaque should be set if the caller
-  // knows the bitmap will be completely opaque and allows some optimizations.
-  //
-  // The shared_section parameter is optional (pass NULL for default behavior).
-  // If shared_section is non-null, then it must be a handle to a file-mapping
-  // object returned by CreateFileMapping.  See CreateDIBSection for details.
-  static BitmapPlatformDeviceWin* create(HDC screen_dc,
-                                int width,
-                                int height,
-                                bool is_opaque,
-                                HANDLE shared_section);
-
-  // Copy constructor. When copied, devices duplicate their internal data, so
-  // stay linked. This is because their implementation is very heavyweight
-  // (lots of memory and some GDI objects). If a device has been copied, both
-  // clip rects and other state will stay in sync.
-  //
-  // This means it will NOT work to duplicate a device and assign it to a
-  // canvas, because the two canvases will each set their own clip rects, and
-  // the resulting GDI clip rect will be random.
-  //
-  // Copy constucting and "=" is designed for saving the device or passing it
-  // around to another routine willing to deal with the bitmap data directly.
-  BitmapPlatformDeviceWin(const BitmapPlatformDeviceWin& other);
-  virtual ~BitmapPlatformDeviceWin();
-
-  // See warning for copy constructor above.
-  BitmapPlatformDeviceWin& operator=(const BitmapPlatformDeviceWin& other);
-
-  // Retrieves the bitmap DC, which is the memory DC for our bitmap data. The
-  // bitmap DC is lazy created.
-  virtual HDC getBitmapDC();
-  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
-
-  virtual void drawToHDC(HDC dc, int x, int y, const RECT* src_rect);
-  virtual void prepareForGDI(int x, int y, int width, int height);
-  virtual void postProcessGDI(int x, int y, int width, int height);
-  virtual void makeOpaque(int x, int y, int width, int height);
-  virtual void fixupAlphaBeforeCompositing();
-  virtual bool IsVectorial() { return false; }
-
-  // Returns the color value at the specified location. This does not
-  // consider any transforms that may be set on the device.
-  SkColor getColorAt(int x, int y);
-
- protected:
-  // Flushes the Windows device context so that the pixel data can be accessed
-  // directly by Skia. Overridden from SkDevice, this is called when Skia
-  // starts accessing pixel data.
-  virtual void onAccessBitmap(SkBitmap* bitmap);
-
- private:
-  // Function pointer used by the processPixels method for setting the alpha
-  // value of a particular pixel.
-  typedef void (*adjustAlpha)(uint32_t* pixel);
-
-  // Reference counted data that can be shared between multiple devices. This
-  // allows copy constructors and operator= for devices to work properly. The
-  // bitmaps used by the base device class are already refcounted and copyable.
-  class BitmapPlatformDeviceWinData;
-
-  // Private constructor.
-  BitmapPlatformDeviceWin(BitmapPlatformDeviceWinData* data,
-                          const SkBitmap& bitmap);
-
-  // Loops through each of the pixels in the specified range, invoking
-  // adjustor for the alpha value of each pixel. If |width| or |height| are -1,
-  // the available width/height is used.
-  template<adjustAlpha adjustor>
-  void processPixels(int x,
-                     int y,
-                     int width,
-                     int height);
-
-  // Data associated with this device, guaranteed non-null.
-  scoped_refptr<BitmapPlatformDeviceWinData> data_;
-};
-
-}  // namespace gfx
+// TODO(brettw) this file should be removed and the includes changed to this
+// new location.
+#include "webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceWin.h"
 
 #endif  // BASE_GFX_BITMAP_PLATFORM_DEVICE_WIN_H_
 
diff --git a/base/gfx/platform_canvas.h b/base/gfx/platform_canvas.h
index d7442cc..5bf0ec1 100644
--- a/base/gfx/platform_canvas.h
+++ b/base/gfx/platform_canvas.h
@@ -2,31 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Declare a platform-neutral name for this platform's canvas class
-// that can be used by upper-level classes that just need to pass a reference
-// around.
-
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include "base/gfx/platform_canvas_win.h"
-namespace gfx {
-
-typedef PlatformCanvasWin PlatformCanvas;
-
-}  // namespace gfx
-#elif defined(OS_MACOSX)
-#include "base/gfx/platform_canvas_mac.h"
-namespace gfx {
-
-typedef PlatformCanvasMac PlatformCanvas;
-
-}  // namespace gfx
-#elif defined(OS_LINUX)
-#include "base/gfx/platform_canvas_linux.h"
-namespace gfx {
-
-typedef PlatformCanvasLinux PlatformCanvas;
-
-}  // namespace gfx
-#endif
+// TODO(brettw) this file should be removed and the includes changed to this
+// new location.
+#include "webkit/port/platform/graphics/skia/public/PlatformCanvas.h"
diff --git a/base/gfx/platform_canvas_linux.h b/base/gfx/platform_canvas_linux.h
index 804c6b6..dbd9fc2 100644
--- a/base/gfx/platform_canvas_linux.h
+++ b/base/gfx/platform_canvas_linux.h
@@ -5,47 +5,8 @@
 #ifndef BASE_GFX_PLATFORM_CANVAS_LINUX_H_
 #define BASE_GFX_PLATFORM_CANVAS_LINUX_H_
 
-#include "base/gfx/platform_device_linux.h"
-#include "base/basictypes.h"
-
-namespace gfx {
-
-// This class is a specialization of the regular SkCanvas that is designed to
-// work with a gfx::PlatformDevice to manage platform-specific drawing. It
-// allows using both Skia operations and platform-specific operations.
-class PlatformCanvasLinux : public SkCanvas {
- public:
-  // Set is_opaque if you are going to erase the bitmap and not use
-  // tranparency: this will enable some optimizations.  The shared_section
-  // parameter is passed to gfx::PlatformDevice::create.  See it for details.
-  //
-  // If you use the version with no arguments, you MUST call initialize()
-  PlatformCanvasLinux();
-  PlatformCanvasLinux(int width, int height, bool is_opaque);
-  virtual ~PlatformCanvasLinux();
-
-  // For two-part init, call if you use the no-argument constructor above
-  bool initialize(int width, int height, bool is_opaque);
-
-  // Returns the platform device pointer of the topmost rect with a non-empty
-  // clip. Both the windows and mac versions have an equivalent of this method;
-  // a Linux version is added for compatibility.
-  PlatformDeviceLinux& getTopPlatformDevice() const;
-
- protected:
-  // Creates a device store for use by the canvas. We override this so that
-  // the device is always our own so we know that we can use GDI operations
-  // on it. Simply calls into createPlatformDevice().
-  virtual SkDevice* createDevice(SkBitmap::Config, int width, int height,
-                                 bool is_opaque, bool isForLayer);
-
-  // Creates a device store for use by the canvas. By default, it creates a
-  // BitmapPlatformDevice object. Can be overridden to change the object type.
-  virtual SkDevice* createPlatformDevice(int width, int height, bool is_opaque);
-
-  DISALLOW_COPY_AND_ASSIGN(PlatformCanvasLinux);
-};
-
-}  // namespace gfx
+// TODO(brettw) this file should be removed and the includes changed to this
+// new location.
+#include "webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.h"
 
 #endif  // BASE_GFX_PLATFORM_CANVAS_MAC_H_
diff --git a/base/gfx/platform_canvas_mac.h b/base/gfx/platform_canvas_mac.h
index 3f79fb3..6ee78e8 100755
--- a/base/gfx/platform_canvas_mac.h
+++ b/base/gfx/platform_canvas_mac.h
@@ -5,83 +5,9 @@
 #ifndef BASE_GFX_PLATFORM_CANVAS_MAC_H__
 #define BASE_GFX_PLATFORM_CANVAS_MAC_H__
 
-#include "base/gfx/platform_device_mac.h"
-#include "base/basictypes.h"
-
-#import "SkCanvas.h"
-
-namespace gfx {
-
-// This class is a specialization of the regular SkCanvas that is designed to
-// work with a gfx::PlatformDevice to manage platform-specific drawing. It
-// allows using both Skia operations and platform-specific operations.
-class PlatformCanvasMac : public SkCanvas {
- public:
-  // Set is_opaque if you are going to erase the bitmap and not use
-  // tranparency: this will enable some optimizations.  The shared_section
-  // parameter is passed to gfx::PlatformDevice::create.  See it for details.
-  //
-  // If you use the version with no arguments, you MUST call initialize()
-  PlatformCanvasMac();
-  PlatformCanvasMac(int width, int height, bool is_opaque);
-  PlatformCanvasMac(int width, int height, bool is_opaque, CGContextRef context);
-  virtual ~PlatformCanvasMac();
-
-  // For two-part init, call if you use the no-argument constructor above
-  bool initialize(int width, int height, bool is_opaque);
-
-  // These calls should surround calls to platform drawing routines. The CG
-  // context returned by beginPlatformPaint is the one that can be used to
-  // draw into.
-  // Call endPlatformPaint when you are done and want to use Skia operations
-  // again; this will synchronize the bitmap.
-  virtual CGContextRef beginPlatformPaint();
-  virtual void endPlatformPaint();
-
-  // Returns the platform device pointer of the topmost rect with a non-empty
-  // clip. In practice, this is usually either the top layer or nothing, since
-  // we usually set the clip to new layers when we make them.
-  //
-  // If there is no layer that is not all clipped out, this will return a
-  // dummy device so callers do not have to check. If you are concerned about
-  // performance, check the clip before doing any painting.
-  //  
-  // This is different than SkCanvas' getDevice, because that returns the
-  // bottommost device.
-  //
-  // Danger: the resulting device should not be saved. It will be invalidated
-  // by the next call to save() or restore().
-  PlatformDeviceMac& getTopPlatformDevice() const;
-
-  // Allow callers to see the non-virtual function even though we have an
-  // override of a virtual one.
-  using SkCanvas::clipRect;
-
- protected:
-  // Creates a device store for use by the canvas. We override this so that
-  // the device is always our own so we know that we can use GDI operations
-  // on it. Simply calls into createPlatformDevice().
-  virtual SkDevice* createDevice(SkBitmap::Config, int width, int height,
-                                 bool is_opaque, bool isForLayer);
-
-  // Creates a device store for use by the canvas. By default, it creates a
-  // BitmapPlatformDevice object. Can be overridden to change the object type.
-  virtual SkDevice* createPlatformDevice(int width, int height, bool is_opaque,
-                                         CGContextRef context);
-
- private:
-  // Unimplemented. This is to try to prevent people from calling this function
-  // on SkCanvas. SkCanvas' version is not virtual, so we can't prevent this
-  // 100%, but hopefully this will make people notice and not use the function.
-  // Calling SkCanvas' version will create a new device which is not compatible
-  // with us and we will crash if somebody tries to draw into it with
-  // CoreGraphics.
-  SkDevice* setBitmapDevice(const SkBitmap& bitmap);
-
-  DISALLOW_COPY_AND_ASSIGN(PlatformCanvasMac);
-};
-
-}  // namespace gfx
+// TODO(brettw) this file should be removed and the includes changed to this
+// new location.
+#include "webkit/port/platform/graphics/skia/public/PlatformCanvasMac.h"
 
 #endif  // BASE_GFX_PLATFORM_CANVAS_MAC_H__
 
diff --git a/base/gfx/platform_canvas_win.h b/base/gfx/platform_canvas_win.h
index 95ae856..8bd285b 100644
--- a/base/gfx/platform_canvas_win.h
+++ b/base/gfx/platform_canvas_win.h
@@ -5,192 +5,9 @@
 #ifndef BASE_GFX_PLATFORM_CANVAS_WIN_H_
 #define BASE_GFX_PLATFORM_CANVAS_WIN_H_
 
-#include "base/gfx/platform_device_win.h"
-#include "base/basictypes.h"
-
-#include "SkCanvas.h"
-
-namespace gfx {
-
-// This class is a specialization of the regular SkCanvas that is designed to
-// work with a gfx::PlatformDevice to manage platform-specific drawing. It
-// allows using both Skia operations and platform-specific operations.
-class PlatformCanvasWin : public SkCanvas {
- public:
-  // Set is_opaque if you are going to erase the bitmap and not use
-  // transparency: this will enable some optimizations.  The shared_section
-  // parameter is passed to gfx::PlatformDevice::create.  See it for details.
-  //
-  // If you use the version with no arguments, you MUST call initialize()
-  PlatformCanvasWin();
-  PlatformCanvasWin(int width, int height, bool is_opaque);
-  PlatformCanvasWin(int width, int height, bool is_opaque,
-                    HANDLE shared_section);
-  virtual ~PlatformCanvasWin();
-
-  // For two-part init, call if you use the no-argument constructor above. Note
-  // that we want this to optionally match the Linux initialize if you only
-  // pass 3 arguments, hence the evil default argument.
-  bool initialize(int width, int height, bool is_opaque,
-                  HANDLE shared_section = NULL);
-
-  // These calls should surround calls to platform drawing routines, the DC
-  // returned by beginPlatformPaint is the DC that can be used to draw into.
-  // Call endPlatformPaint when you are done and want to use Skia operations
-  // again; this will synchronize the bitmap to Windows.
-  virtual HDC beginPlatformPaint();
-  virtual void endPlatformPaint();
-
-  // Returns the platform device pointer of the topmost rect with a non-empty
-  // clip. In practice, this is usually either the top layer or nothing, since
-  // we usually set the clip to new layers when we make them.
-  //
-  // If there is no layer that is not all clipped out, this will return a
-  // dummy device so callers do not have to check. If you are concerned about
-  // performance, check the clip before doing any painting.
-  //
-  // This is different than SkCanvas' getDevice, because that returns the
-  // bottommost device.
-  //
-  // Danger: the resulting device should not be saved. It will be invalidated
-  // by the next call to save() or restore().
-  PlatformDeviceWin& getTopPlatformDevice() const;
-
- protected:
-  // Creates a device store for use by the canvas. We override this so that
-  // the device is always our own so we know that we can use GDI operations
-  // on it. Simply calls into createPlatformDevice().
-  virtual SkDevice* createDevice(SkBitmap::Config, int width, int height,
-                                 bool is_opaque, bool isForLayer);
-
-  // Creates a device store for use by the canvas. By default, it creates a
-  // BitmapPlatformDeviceWin. Can be overridden to change the object type.
-  virtual SkDevice* createPlatformDevice(int width, int height, bool is_opaque,
-                                         HANDLE shared_section);
-
- private:
-  // Unimplemented.
-  virtual SkDevice* setBitmapDevice(const SkBitmap& bitmap);
-
-  DISALLOW_COPY_AND_ASSIGN(PlatformCanvasWin);
-};
-
-// A class designed to help with WM_PAINT operations on Windows. It will
-// do BeginPaint/EndPaint on init/destruction, and will create the bitmap and
-// canvas with the correct size and transform for the dirty rect. The bitmap
-// will be automatically painted to the screen on destruction.
-//
-// You MUST call isEmpty before painting to determine if anything needs
-// painting. Sometimes the dirty rect can actually be empty, and this makes
-// the bitmap functions we call unhappy. The caller should not paint in this
-// case.
-//
-// Therefore, all you need to do is:
-//   case WM_PAINT: {
-//     gfx::PlatformCanvasWinPaint canvas(hwnd);
-//     if (!canvas.isEmpty()) {
-//       ... paint to the canvas ...
-//     }
-//     return 0;
-//   }
-template <class T>
-class CanvasPaintT : public T {
- public:
-  CanvasPaintT(HWND hwnd) : hwnd_(hwnd), paint_dc_(NULL), for_paint_(true) {
-    memset(&ps_, 0, sizeof(ps_));
-    initPaint(true);
-  }
-
-  CanvasPaintT(HWND hwnd, bool opaque) : hwnd_(hwnd), paint_dc_(NULL),
-      for_paint_(true) {
-    memset(&ps_, 0, sizeof(ps_));
-    initPaint(opaque);
-  }
-
-  // Creates a CanvasPaintT for the specified region that paints to the
-  // specified dc. This does NOT do BeginPaint/EndPaint.
-  CanvasPaintT(HDC dc, bool opaque, int x, int y, int w, int h)
-      : hwnd_(NULL),
-        paint_dc_(dc),
-        for_paint_(false) {
-    memset(&ps_, 0, sizeof(ps_));
-    ps_.rcPaint.left = x;
-    ps_.rcPaint.right = x + w;
-    ps_.rcPaint.top = y;
-    ps_.rcPaint.bottom = y + h;
-    init(opaque);
-  }
-
-
-  virtual ~CanvasPaintT() {
-    if (!isEmpty()) {
-      restoreToCount(1);
-      // Commit the drawing to the screen
-      getTopPlatformDevice().drawToHDC(paint_dc_,
-                                       ps_.rcPaint.left, ps_.rcPaint.top,
-                                       NULL);
-    }
-    if (for_paint_)
-      EndPaint(hwnd_, &ps_);
-  }
-
-  // Returns true if the invalid region is empty. The caller should call this
-  // function to determine if anything needs painting.
-  bool isEmpty() const {
-    return ps_.rcPaint.right - ps_.rcPaint.left == 0 ||
-           ps_.rcPaint.bottom - ps_.rcPaint.top == 0;
-  }
-
-  // Use to access the Windows painting parameters, especially useful for
-  // getting the bounding rect for painting: paintstruct().rcPaint
-  const PAINTSTRUCT& paintStruct() const {
-    return ps_;
-  }
-
-  // Returns the DC that will be painted to
-  HDC paintDC() const {
-    return paint_dc_;
-  }
-
- protected:
-  HWND hwnd_;
-  HDC paint_dc_;
-  PAINTSTRUCT ps_;
-
- private:
-  void initPaint(bool opaque) {
-    paint_dc_ = BeginPaint(hwnd_, &ps_);
-
-    init(opaque);
-  }
-
-  void init(bool opaque) {
-    // FIXME(brettw) for ClearType, we probably want to expand the bounds of
-    // painting by one pixel so that the boundaries will be correct (ClearType
-    // text can depend on the adjacent pixel). Then we would paint just the
-    // inset pixels to the screen.
-    const int width = ps_.rcPaint.right - ps_.rcPaint.left;
-    const int height = ps_.rcPaint.bottom - ps_.rcPaint.top;
-    if (!initialize(width, height, opaque, NULL)) {
-      // Cause a deliberate crash;
-      *(char*) 0 = 0;
-    }
-
-    // This will bring the canvas into the screen coordinate system for the
-    // dirty rect
-    translate(SkIntToScalar(-ps_.rcPaint.left),
-              SkIntToScalar(-ps_.rcPaint.top));
-  }
-
-  // If true, this canvas was created for a BeginPaint.
-  const bool for_paint_;
-
-  DISALLOW_COPY_AND_ASSIGN(CanvasPaintT);
-};
-
-typedef CanvasPaintT<PlatformCanvasWin> PlatformCanvasWinPaint;
-
-}  // namespace gfx
+// TODO(brettw) this file should be removed and the includes changed to this
+// new location.
+#include "webkit/port/platform/graphics/skia/public/PlatformCanvasWin.h"
 
 #endif  // BASE_GFX_PLATFORM_CANVAS_WIN_H_
 
diff --git a/base/gfx/platform_device.h b/base/gfx/platform_device.h
index f1c890c..11202c6 100644
--- a/base/gfx/platform_device.h
+++ b/base/gfx/platform_device.h
@@ -2,26 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Declare a platform-neutral name for this platform's device class
-// that can be used by upper-level classes that just need to pass a reference
-// around.
-
-#if defined(OS_WIN)
-#include "base/gfx/platform_device_win.h"
-#elif defined(OS_MACOSX)
-#include "base/gfx/platform_device_mac.h"
-#elif defined(OS_LINUX)
-#include "base/gfx/platform_device_linux.h"
-#endif
-
-namespace gfx {
-  
-#if defined(OS_WIN)
-typedef PlatformDeviceWin PlatformDevice;
-#elif defined(OS_MACOSX)
-typedef PlatformDeviceMac PlatformDevice;
-#elif defined(OS_LINUX)
-typedef PlatformDeviceLinux PlatformDevice;
-#endif
-  
-}  // namespace gfx
+// TODO(brettw) this file should be removed and the includes changed to this
+// new location.
+#include "webkit/port/platform/graphics/skia/public/PlatformDevice.h"
diff --git a/base/gfx/platform_device_linux.h b/base/gfx/platform_device_linux.h
index 8be2e4a..ffd5a2d 100644
--- a/base/gfx/platform_device_linux.h
+++ b/base/gfx/platform_device_linux.h
@@ -5,21 +5,8 @@
 #ifndef BASE_GFX_PLATFORM_DEVICE_LINUX_H_
 #define BASE_GFX_PLATFORM_DEVICE_LINUX_H_
 
-#include "SkDevice.h"
-
-namespace gfx {
-
-// Blindly copying the mac hierarchy.
-class PlatformDeviceLinux : public SkDevice {
- public:
-  // Returns if the preferred rendering engine is vectorial or bitmap based.
-  virtual bool IsVectorial() = 0;
-
- protected:
-  // Forwards |bitmap| to SkDevice's constructor.
-  PlatformDeviceLinux(const SkBitmap& bitmap);
-};
-
-}  // namespace gfx
+// TODO(brettw) this file should be removed and the includes changed to this
+// new location.
+#include "webkit/port/platform/graphics/skia/public/PlatformDeviceLinux.h"
 
 #endif  // BASE_GFX_PLATFORM_DEVICE_LINUX_H_
diff --git a/base/gfx/platform_device_mac.h b/base/gfx/platform_device_mac.h
index 79a14be..f7b1bd0 100755
--- a/base/gfx/platform_device_mac.h
+++ b/base/gfx/platform_device_mac.h
@@ -5,82 +5,9 @@
 #ifndef BASE_GFX_PLATFORM_DEVICE_MAC_H__
 #define BASE_GFX_PLATFORM_DEVICE_MAC_H__
 
-#import <ApplicationServices/ApplicationServices.h>
-#include "SkDevice.h"
-
-class SkMatrix;
-class SkPath;
-class SkRegion;
-
-namespace gfx {
-
-// A device is basically a wrapper around SkBitmap that provides a surface for
-// SkCanvas to draw into. Our device provides a surface CoreGraphics can also
-// write to. It also provides functionality to play well with CG drawing
-// functions.
-// This class is abstract and must be subclassed. It provides the basic
-// interface to implement it either with or without a bitmap backend.
-class PlatformDeviceMac : public SkDevice {
- public:
-  // The CGContext that corresponds to the bitmap, used for CoreGraphics
-  // operations drawing into the bitmap. This is possibly heavyweight, so it
-  // should exist only during one pass of rendering.
-  virtual CGContextRef GetBitmapContext() = 0;
-
-  // Draws to the given graphics context. If the bitmap context doesn't exist,
-  // this will temporarily create it. However, if you have created the bitmap
-  // context, it will be more efficient if you don't free it until after this
-  // call so it doesn't have to be created twice.  If src_rect is null, then
-  // the entirety of the source device will be copied.
-  virtual void DrawToContext(CGContextRef context, int x, int y,
-                             const CGRect* src_rect) = 0;
-
-  // Sets the opacity of each pixel in the specified region to be opaque.
-  void makeOpaque(int x, int y, int width, int height);
-
-  // Returns if the preferred rendering engine is vectorial or bitmap based.
-  virtual bool IsVectorial() = 0;
-
-  // On platforms where the native rendering API does not support rendering
-  // into bitmaps with a premultiplied alpha channel, this call is responsible
-  // for doing any fixup necessary.  It is not used on the Mac, since
-  // CoreGraphics can handle premultiplied alpha just fine.
-  virtual void fixupAlphaBeforeCompositing() = 0;
-
-  // Initializes the default settings and colors in a device context.
-  static void InitializeCGContext(CGContextRef context);
-
-  // Loads a SkPath into the CG context. The path can there after be used for
-  // clipping or as a stroke.
-  static void LoadPathToCGContext(CGContextRef context, const SkPath& path);
-
-  // Loads a SkRegion into the CG context.
-  static void LoadClippingRegionToCGContext(CGContextRef context, 
-                                            const SkRegion& region,
-                                            const SkMatrix& transformation);  
-  
- protected:
-  // Forwards |bitmap| to SkDevice's constructor.
-  PlatformDeviceMac(const SkBitmap& bitmap);
-
-  // Loads the specified Skia transform into the device context
-  static void LoadTransformToCGContext(CGContextRef context,
-                                       const SkMatrix& matrix);
-
-  // Function pointer used by the processPixels method for setting the alpha
-  // value of a particular pixel.
-  typedef void (*adjustAlpha)(uint32_t* pixel);
-  
-  // Loops through each of the pixels in the specified range, invoking
-  // adjustor for the alpha value of each pixel.
-  virtual void processPixels(int x,
-                             int y,
-                             int width,
-                             int height,
-                             adjustAlpha adjustor) = 0;
-};
-
-}  // namespace gfx
+// TODO(brettw) this file should be removed and the includes changed to this
+// new location.
+#include "webkit/port/platform/graphics/skia/public/PlatformDeviceMac.h"
 
 #endif  // BASE_GFX_PLATFORM_DEVICE_MAC_H__
 
diff --git a/base/gfx/platform_device_win.h b/base/gfx/platform_device_win.h
index d5052a2..e39dfe1 100644
--- a/base/gfx/platform_device_win.h
+++ b/base/gfx/platform_device_win.h
@@ -5,92 +5,9 @@
 #ifndef BASE_GFX_PLATFORM_DEVICE_WIN_H__
 #define BASE_GFX_PLATFORM_DEVICE_WIN_H__
 
-#include <vector>
-
-#include "SkDevice.h"
-
-class SkMatrix;
-class SkPath;
-class SkRegion;
-
-namespace gfx {
-
-// A device is basically a wrapper around SkBitmap that provides a surface for
-// SkCanvas to draw into. Our device provides a surface Windows can also write
-// to. It also provides functionality to play well with GDI drawing functions.
-// This class is abstract and must be subclassed. It provides the basic
-// interface to implement it either with or without a bitmap backend.
-class PlatformDeviceWin : public SkDevice {
- public:
-  // The DC that corresponds to the bitmap, used for GDI operations drawing
-  // into the bitmap. This is possibly heavyweight, so it should be existant
-  // only during one pass of rendering.
-  virtual HDC getBitmapDC() = 0;
-
-  // Draws to the given screen DC, if the bitmap DC doesn't exist, this will
-  // temporarily create it. However, if you have created the bitmap DC, it will
-  // be more efficient if you don't free it until after this call so it doesn't
-  // have to be created twice.  If src_rect is null, then the entirety of the
-  // source device will be copied.
-  virtual void drawToHDC(HDC dc, int x, int y, const RECT* src_rect) = 0;
-
-  // Invoke before using GDI functions. See description in platform_device.cc
-  // for specifics.
-  // NOTE: x,y,width and height are relative to the current transform.
-  virtual void prepareForGDI(int x, int y, int width, int height) { }
-
-  // Invoke after using GDI functions. See description in platform_device.cc
-  // for specifics.
-  // NOTE: x,y,width and height are relative to the current transform.
-  virtual void postProcessGDI(int x, int y, int width, int height) { }
-
-  // Sets the opacity of each pixel in the specified region to be opaque.
-  virtual void makeOpaque(int x, int y, int width, int height) { }
-
-  // Call this function to fix the alpha channels before compositing this layer
-  // onto another. Internally, the device uses a special alpha method to work
-  // around problems with Windows. This call will put the values into what
-  // Skia expects, so it can be composited onto other layers.
-  //
-  // After this call, no more drawing can be done because the
-  // alpha channels will be "correct", which, if this function is called again
-  // will make them wrong. See the implementation for more discussion.
-  virtual void fixupAlphaBeforeCompositing() { }
-
-  // Returns if the preferred rendering engine is vectorial or bitmap based.
-  virtual bool IsVectorial() = 0;
-
-  // Initializes the default settings and colors in a device context.
-  static void InitializeDC(HDC context);
-
-  // Loads a SkPath into the GDI context. The path can there after be used for
-  // clipping or as a stroke.
-  static void LoadPathToDC(HDC context, const SkPath& path);
-
-  // Loads a SkRegion into the GDI context.
-  static void LoadClippingRegionToDC(HDC context, const SkRegion& region,
-                                     const SkMatrix& transformation);
-
- protected:
-  // Arrays must be inside structures.
-  struct CubicPoints {
-    SkPoint p[4];
-  };
-  typedef std::vector<CubicPoints> CubicPath;
-  typedef std::vector<CubicPath> CubicPaths;
-
-  // Forwards |bitmap| to SkDevice's constructor.
-  PlatformDeviceWin(const SkBitmap& bitmap);
-
-  // Loads the specified Skia transform into the device context, excluding
-  // perspective (which GDI doesn't support).
-  static void LoadTransformToDC(HDC dc, const SkMatrix& matrix);
-
-  // Transforms SkPath's paths into a series of cubic path.
-  static bool SkPathToCubicPaths(CubicPaths* paths, const SkPath& skpath);
-};
-
-}  // namespace gfx
+// TODO(brettw) this file should be removed and the includes changed to this
+// new location.
+#include "webkit/port/platform/graphics/skia/public/PlatformDeviceWin.h"
 
 #endif  // BASE_GFX_PLATFORM_DEVICE_WIN_H__
 
diff --git a/base/gfx/vector_device.h b/base/gfx/vector_device.h
index 5ebc558..55fe22e 100644
--- a/base/gfx/vector_device.h
+++ b/base/gfx/vector_device.h
@@ -2,118 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_GFX_VECTOR_DEVICE_H_
-#define BASE_GFX_VECTOR_DEVICE_H_
-
-#include "base/basictypes.h"
-#include "base/gfx/platform_device_win.h"
-#include "SkMatrix.h"
-#include "SkRegion.h"
-
-namespace gfx {
-
-// A device is basically a wrapper around SkBitmap that provides a surface for
-// SkCanvas to draw into. This specific device is not not backed by a surface
-// and is thus unreadable. This is because the backend is completely vectorial.
-// This device is a simple wrapper over a Windows device context (HDC) handle.
-class VectorDevice : public PlatformDeviceWin {
- public:
-  // Factory function. The DC is kept as the output context.
-  static VectorDevice* create(HDC dc, int width, int height);
-
-  VectorDevice(HDC dc, const SkBitmap& bitmap);
-  virtual ~VectorDevice();
-
-  virtual HDC getBitmapDC() {
-    return hdc_;
-  }
-
-  virtual void drawPaint(const SkDraw& draw, const SkPaint& paint);
-  virtual void drawPoints(const SkDraw& draw, SkCanvas::PointMode mode,
-                          size_t count, const SkPoint[], const SkPaint& paint);
-  virtual void drawRect(const SkDraw& draw, const SkRect& r,
-                        const SkPaint& paint);
-  virtual void drawPath(const SkDraw& draw, const SkPath& path,
-                        const SkPaint& paint);
-  virtual void drawBitmap(const SkDraw& draw, const SkBitmap& bitmap,
-                          const SkMatrix& matrix, const SkPaint& paint);
-  virtual void drawSprite(const SkDraw& draw, const SkBitmap& bitmap,
-                          int x, int y, const SkPaint& paint);
-  virtual void drawText(const SkDraw& draw, const void* text, size_t len,
-                        SkScalar x, SkScalar y, const SkPaint& paint);
-  virtual void drawPosText(const SkDraw& draw, const void* text, size_t len,
-                           const SkScalar pos[], SkScalar constY,
-                           int scalarsPerPos, const SkPaint& paint);
-  virtual void drawTextOnPath(const SkDraw& draw, const void* text, size_t len,
-                              const SkPath& path, const SkMatrix* matrix,
-                              const SkPaint& paint);
-  virtual void drawVertices(const SkDraw& draw, SkCanvas::VertexMode,
-                            int vertexCount,
-                            const SkPoint verts[], const SkPoint texs[],
-                            const SkColor colors[], SkXfermode* xmode,
-                            const uint16_t indices[], int indexCount,
-                            const SkPaint& paint);
-  virtual void drawDevice(const SkDraw& draw, SkDevice*, int x, int y,
-                          const SkPaint&);
-
-
-  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
-  virtual void drawToHDC(HDC dc, int x, int y, const RECT* src_rect);
-  virtual bool IsVectorial() { return true; }
-
-  void LoadClipRegion();
-
- private:
-  // Applies the SkPaint's painting properties in the current GDI context, if
-  // possible. If GDI can't support all paint's properties, returns false. It
-  // doesn't execute the "commands" in SkPaint.
-  bool ApplyPaint(const SkPaint& paint);
-
-  // Selects a new object in the device context. It can be a pen, a brush, a
-  // clipping region, a bitmap or a font. Returns the old selected object.
-  HGDIOBJ SelectObject(HGDIOBJ object);
-
-  // Creates a brush according to SkPaint's properties.
-  bool CreateBrush(bool use_brush, const SkPaint& paint);
-
-  // Creates a pen according to SkPaint's properties.
-  bool CreatePen(bool use_pen, const SkPaint& paint);
-
-  // Restores back the previous objects (pen, brush, etc) after a paint command.
-  void Cleanup();
-
-  // Creates a brush according to SkPaint's properties.
-  bool CreateBrush(bool use_brush, COLORREF color);
-
-  // Creates a pen according to SkPaint's properties.
-  bool CreatePen(bool use_pen, COLORREF color, int stroke_width,
-                 float stroke_miter, DWORD pen_style);
-
-  // Draws a bitmap in the the device, using the currently loaded matrix.
-  void InternalDrawBitmap(const SkBitmap& bitmap, int x, int y,
-                          const SkPaint& paint);
-
-  // The Windows Device Context handle. It is the backend used with GDI drawing.
-  // This backend is write-only and vectorial.
-  HDC hdc_;
-
-  // Translation assigned to the DC: we need to keep track of this separately
-  // so it can be updated even if the DC isn't created yet.
-  SkMatrix transform_;
-
-  // The current clipping
-  SkRegion clip_region_;
-
-  // Previously selected brush before the current drawing.
-  HGDIOBJ previous_brush_;
-
-  // Previously selected pen before the current drawing.
-  HGDIOBJ previous_pen_;
-
-  DISALLOW_COPY_AND_ASSIGN(VectorDevice);
-};
-
-}  // namespace gfx
-
-#endif  // BASE_GFX_VECTOR_DEVICE_H_
-
+// TODO(brettw) this file should be removed and the includes changed to this
+// new location.
+#include "webkit/port/platform/graphics/skia/public/VectorDevice.h"
diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index f22b4d5..e47023b 100755
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -13,45 +13,45 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Browser", "Browser", "{9755
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser", "browser\browser.vcproj", "{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer\renderer.vcproj", "{9301A569-5D2B-4D11-9332-B1E30AEACB8D}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer\renderer.vcproj", "{9301A569-5D2B-4D11-9332-B1E30AEACB8D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipc_tests", "common\ipc_tests.vcproj", "{B92AE829-E1CD-4781-824A-DCB1603A1672}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipc_tests", "common\ipc_tests.vcproj", "{B92AE829-E1CD-4781-824A-DCB1603A1672}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcproj", "{899F1280-3441-4D1F-BA04-CCD6208D9146}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcproj", "{899F1280-3441-4D1F-BA04-CCD6208D9146}"
 	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
-	EndProjectSection
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebKit (readonly)", "WebKit (readonly)", "{1088577A-0C49-4DE0-85CD-B68AD0BE55AA}"
@@ -61,39 +61,39 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebKit (readonly)", "WebKit
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore", "..\webkit\build\WebCore\WebCore.vcproj", "{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {4BD929D4-494B-4EE8-91F6-FD0277A51D2B}
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Port", "..\webkit\build\port\port.vcproj", "{5597AD47-3494-4750-A235-4F9C2F864700}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
+		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {4BD929D4-494B-4EE8-91F6-FD0277A51D2B}
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Port", "..\webkit\build\port\port.vcproj", "{5597AD47-3494-4750-A235-4F9C2F864700}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glue", "..\webkit\build\glue\glue.vcproj", "{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glue", "..\webkit\build\glue\glue.vcproj", "{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia", "..\skia\skia.vcproj", "{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -108,22 +108,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "..\webkit\build\Java
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "views", "views\views.vcproj", "{6F9258E5-294F-47B2-919D-17FFE7A8B751}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\third_party\sqlite\sqlite.vcproj", "{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\third_party\sqlite\sqlite.vcproj", "{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -144,13 +144,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "automation", "test\automati
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icu", "..\third_party\icu38\build\icu.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icudt", "..\third_party\icu38\build\icudt.vcproj", "{A0D94973-D355-47A5-A1E2-3456F321F010}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -183,18 +183,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "..\third_party\l
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image_diff", "tools\test\image_diff\image_diff.vcproj", "{50B079C7-CD01-42D3-B8C4-9F8D9322E822}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Breakpad", "Breakpad", "{873D095E-150E-4262-8C41-2D8ED02F0F57}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -215,13 +215,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "breakpad_sender", "..\break
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml", "..\third_party\libxml\build\libxml.vcproj", "{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hunspell", "third_party\hunspell\hunspell.vcproj", "{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -230,14 +230,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hunspell", "third_party\hun
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\third_party\libxslt\build\libxslt.vcproj", "{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {4BD929D4-494B-4EE8-91F6-FD0277A51D2B}
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
+		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {4BD929D4-494B-4EE8-91F6-FD0277A51D2B}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lzma_sdk", "..\third_party\lzma_sdk\7z_C.vcproj", "{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -252,56 +252,56 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generated_resources", "app\
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V8Bindings", "..\webkit\build\V8Bindings\V8Bindings.vcproj", "{625A8F11-2B4E-45B4-BD99-C6D629C606C0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_dll", "app\chrome_dll.vcproj", "{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
-		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
-		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E} = {D703D7A0-EDC1-4FE6-9E22-56154155B24E}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_dll", "app\chrome_dll.vcproj", "{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E} = {D703D7A0-EDC1-4FE6-9E22-56154155B24E}
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\third_party\bzip2\bzip2.vcproj", "{2A70CBF0-847E-4E3A-B926-542A656DC7FE}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -316,37 +316,37 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npapi_layout_test_plugin",
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell", "..\webkit\tools\test_shell\test_shell.vcproj", "{FA39524D-3067-4141-888D-28A86C66F2B9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {BE6D5659-A8D5-4890-A42C-090DD10EF62C}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {BE6D5659-A8D5-4890-A42C-090DD10EF62C}
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin", "plugin\plugin.vcproj", "{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -361,108 +361,108 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "V8", "V8", "{B353A6A5-9551-
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_exe", "app\chrome_exe.vcproj", "{7B219FAA-E360-43C8-B341-804A94EEFFAC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{881F6A97-D539-4C48-B401-DF04385B2343} = {881F6A97-D539-4C48-B401-DF04385B2343}
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC} = {89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9} = {C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perf_tests", "test\perf\perftests.vcproj", "{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
-		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9} = {C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC} = {89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}
+		{881F6A97-D539-4C48-B401-DF04385B2343} = {881F6A97-D539-4C48-B401-DF04385B2343}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perf_tests", "test\perf\perftests.vcproj", "{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_tests", "test\unit\unittests.vcproj", "{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
-		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
-		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_tests", "test\unit\unittests.vcproj", "{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{1174D37F-6ABB-45DA-81B3-C631281273B7}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -471,129 +471,130 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{1174D37F-6
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "page_cycler_tests", "test\page_cycler\page_cycler_tests.vcproj", "{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reliability_tests", "test\reliability\reliability_tests.vcproj", "{8A3E1774-1DE9-445C-982D-3EE37C8A752A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reliability_tests", "test\reliability\reliability_tests.vcproj", "{8A3E1774-1DE9-445C-982D-3EE37C8A752A}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "selenium_tests", "test\selenium\selenium_tests.vcproj", "{E3749617-BA3D-4230-B54C-B758E56D9FA5}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "selenium_tests", "test\selenium\selenium_tests.vcproj", "{E3749617-BA3D-4230-B54C-B758E56D9FA5}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "startup_tests", "test\startup\startup_tests.vcproj", "{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "startup_tests", "test\startup\startup_tests.vcproj", "{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_tests", "test\ui\ui_tests.vcproj", "{76235B67-1C27-4627-8A33-4B2E1EF93EDE}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4} = {A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}
-		{A493331B-3180-49FE-8D0E-D121645E63AD} = {A493331B-3180-49FE-8D0E-D121645E63AD}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {BE6D5659-A8D5-4890-A42C-090DD10EF62C}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {E750512D-FC7C-4C98-BF04-0A0DAF882055}
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {E7B11CF0-FE40-4A69-AE20-1B882F4D7585}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_tests", "test\ui\ui_tests.vcproj", "{76235B67-1C27-4627-8A33-4B2E1EF93EDE}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {E7B11CF0-FE40-4A69-AE20-1B882F4D7585}
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {E750512D-FC7C-4C98-BF04-0A0DAF882055}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {BE6D5659-A8D5-4890-A42C-090DD10EF62C}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{A493331B-3180-49FE-8D0E-D121645E63AD} = {A493331B-3180-49FE-8D0E-D121645E63AD}
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4} = {A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox", "..\sandbox\src\sandbox.vcproj", "{881F6A97-D539-4C48-B401-DF04385B2343}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -608,76 +609,76 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{846901FD
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate_profile", "tools\profiles\generate_profile.vcproj", "{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
-		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell_tests", "..\webkit\tools\test_shell\test_shell_tests.vcproj", "{E6766F81-1FCD-4CD7-BC16-E36964A14867}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell_tests", "..\webkit\tools\test_shell\test_shell_tests.vcproj", "{E6766F81-1FCD-4CD7-BC16-E36964A14867}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V8Config", "..\webkit\build\JSConfig\V8Config.vcproj", "{2E2D3301-2EC4-4C0F-B889-87073B30F673}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -692,23 +693,23 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "stats_viewer", "..\tools\st
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "en-US", "app\locales\en-US.vcproj", "{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "locales", "locales", "{2325D8C4-8EF5-42AC-8900-492225750DE4}"
-	ProjectSection(SolutionItems) = preProject
-		app\locales\locale_settings.h = app\locales\locale_settings.h
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(SolutionItems) = preProject
+		app\locales\locale_settings.h = app\locales\locale_settings.h
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_resources", "browser\resources\browser_resources.vcproj", "{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -741,24 +742,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "googleurl", "..\googleurl\b
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npapi_test_plugin", "..\webkit\glue\plugins\test\npapi_test_plugin.vcproj", "{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush_cache", "tools\perf\flush_cache\flush_cache.vcproj", "{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flush_cache", "tools\perf\flush_cache\flush_cache.vcproj", "{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modp_b64", "..\third_party\modp_b64\modp_b64.vcproj", "{7100F41F-868D-4E99-80A2-AF8E6574749D}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -767,91 +768,91 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modp_b64", "..\third_party\
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "activex_shim", "..\webkit\activex_shim\activex_shim.vcproj", "{F4F4BCAA-EA59-445C-A119-3E6C29647A51}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "..\net\build\net.vcproj", "{326E9795-E760-410A-B69A-3F79DB3F5243}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "..\net\build\net.vcproj", "{326E9795-E760-410A-B69A-3F79DB3F5243}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41} = {E13045CD-7E1F-4A41-9B18-8D288B2E7B41}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tld_cleanup", "..\net\build\tld_cleanup.vcproj", "{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tld_cleanup", "..\net\build\tld_cleanup.vcproj", "{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_unittests", "..\net\build\net_unittests.vcproj", "{E99DA267-BE90-4F45-88A1-6919DB2C7567}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_unittests", "..\net\build\net_unittests.vcproj", "{E99DA267-BE90-4F45-88A1-6919DB2C7567}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_perftests", "..\net\build\net_perftests.vcproj", "{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_perftests", "..\net\build\net_perftests.vcproj", "{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "..\media\build\media.vcproj", "{6AE76406-B03B-11DD-94B1-80B556D89593}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "..\media\build\media.vcproj", "{6AE76406-B03B-11DD-94B1-80B556D89593}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media_unittests", "..\media\build\media_unittests.vcproj", "{C8C6183C-B03C-11DD-B471-DFD256D89593}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media_unittests", "..\media\build\media_unittests.vcproj", "{C8C6183C-B03C-11DD-B471-DFD256D89593}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{6AE76406-B03B-11DD-94B1-80B556D89593} = {6AE76406-B03B-11DD-94B1-80B556D89593}
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{6AE76406-B03B-11DD-94B1-80B556D89593} = {6AE76406-B03B-11DD-94B1-80B556D89593}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "..\base\build\base.vcproj", "{1832A374-8A74-4F9E-B536-69A699B3E165}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "..\base\build\base.vcproj", "{1832A374-8A74-4F9E-B536-69A699B3E165}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0E5474AC-5996-4B13-87C0-4AE931EE0815} = {0E5474AC-5996-4B13-87C0-4AE931EE0815}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-	EndProjectSection
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
+		{0E5474AC-5996-4B13-87C0-4AE931EE0815} = {0E5474AC-5996-4B13-87C0-4AE931EE0815}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base_gfx", "..\base\build\base_gfx.vcproj", "{A508ADD3-CECE-4E0F-8448-2F5E454DF551}"
@@ -867,92 +868,92 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_message", "..\base\bu
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base_unittests", "..\base\build\base_unittests.vcproj", "{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_tests", "test\plugin\plugin_tests.vcproj", "{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC} = {414D4D24-5D65-498B-A33F-3A29AD3CDEDC}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {E750512D-FC7C-4C98-BF04-0A0DAF882055}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_tests", "test\plugin\plugin_tests.vcproj", "{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interactive_ui_tests", "test\interactive_ui\interactive_ui.vcproj", "{018D4F38-6272-448F-A864-976DA09F05D0}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
-		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
-		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
-		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
-		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {E750512D-FC7C-4C98-BF04-0A0DAF882055}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC} = {414D4D24-5D65-498B-A33F-3A29AD3CDEDC}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interactive_ui_tests", "test\interactive_ui\interactive_ui.vcproj", "{018D4F38-6272-448F-A864-976DA09F05D0}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {F54ABC59-5C00-414A-A9BA-BAF26D1699F0}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751}
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
+		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
+		{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -961,141 +962,141 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "setup", "installer\setup\setup.vcproj", "{21C76E6E-8B38-44D6-8148-B589C13B9554}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B} = {B84553C8-5676-427B-B3E4-23DDDC4DBC7B}
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0} = {D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0} = {D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B} = {B84553C8-5676-427B-B3E4-23DDDC4DBC7B}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "installer\util\util.vcproj", "{EFBB1436-A63F-4CD8-9E99-B89226E782EC}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "installer\util\util.vcproj", "{EFBB1436-A63F-4CD8-9E99-B89226E782EC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0026A376-C4F1-4575-A1BA-578C69F07013} = {0026A376-C4F1-4575-A1BA-578C69F07013}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mini_installer", "installer\mini_installer\mini_installer.vcproj", "{24A5AC7C-280B-4899-9153-6BA570A081E7}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mini_installer", "installer\mini_installer\mini_installer.vcproj", "{24A5AC7C-280B-4899-9153-6BA570A081E7}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4} = {0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF} = {0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495} = {0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94} = {182D578D-2DAC-4BB7-AFEC-9A2855E56F94}
-		{21C76E6E-8B38-44D6-8148-B589C13B9554} = {21C76E6E-8B38-44D6-8148-B589C13B9554}
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290} = {226B3533-1FF3-42F6-A8E3-C4DDBC955290}
-		{228DD844-9926-420E-B193-6973BF2A4D0B} = {228DD844-9926-420E-B193-6973BF2A4D0B}
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9} = {256DECCE-9886-4C21-96A5-EE47DF5E07E9}
-		{275F2993-EE9B-4E00-9C85-10A182FD423A} = {275F2993-EE9B-4E00-9C85-10A182FD423A}
-		{2F914112-2657-49EC-8EA6-3BA63340DE27} = {2F914112-2657-49EC-8EA6-3BA63340DE27}
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25} = {300C6A09-663E-48B6-8E07-A0D50CAF8F25}
-		{32167995-4014-4E4C-983B-F7E17C24EB25} = {32167995-4014-4E4C-983B-F7E17C24EB25}
-		{34231B28-C51C-4C1C-AF07-C763668B1404} = {34231B28-C51C-4C1C-AF07-C763668B1404}
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF} = {3A932C39-AFA9-4BDC-B775-F71A426D04BF}
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8} = {3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A} = {3E6B24F6-9FA9-4066-859E-BF747FA3080A}
-		{4B60E8B8-416F-40B2-8A54-F75970A21992} = {4B60E8B8-416F-40B2-8A54-F75970A21992}
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196} = {5AEA4BF6-27CD-47FC-9370-D87771CFA196}
-		{5BDB7EE1-A1FD-410C-9598-21519A1B7952} = {5BDB7EE1-A1FD-410C-9598-21519A1B7952}
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8} = {63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}
-		{64D81334-DE73-457D-8FC1-9492508A2663} = {64D81334-DE73-457D-8FC1-9492508A2663}
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF} = {65C78BBB-8FCB-48E4-94C8-1F0F981929AF}
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F} = {7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{7D456640-3619-4D23-A56D-E0084400CCBF} = {7D456640-3619-4D23-A56D-E0084400CCBF}
-		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2} = {7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}
-		{80E37CB5-059D-4F4B-AEF6-08265468D368} = {80E37CB5-059D-4F4B-AEF6-08265468D368}
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681} = {82F5BFE5-FDCE-47D4-8B38-BEEBED561681}
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC} = {89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA} = {9D13D9B8-6C28-42A7-935C-B769EBC55BAA}
-		{9F53807E-9382-47BD-8371-E5D04F517E9C} = {9F53807E-9382-47BD-8371-E5D04F517E9C}
-		{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4} = {A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}
-		{A464166F-8507-49B4-9B02-5CB77C498B25} = {A464166F-8507-49B4-9B02-5CB77C498B25}
-		{A493331B-3180-49FE-8D0E-D121645E63AD} = {A493331B-3180-49FE-8D0E-D121645E63AD}
-		{A5C5D801-4026-49F2-BBF1-250941855306} = {A5C5D801-4026-49F2-BBF1-250941855306}
-		{AFF332BF-AF3D-4D35-86FC-42A727F01D36} = {AFF332BF-AF3D-4D35-86FC-42A727F01D36}
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7} = {B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}
-		{B2D715CE-4CBB-415A-A032-E700C90ADF91} = {B2D715CE-4CBB-415A-A032-E700C90ADF91}
-		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F} = {B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0} = {BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}
-		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9} = {C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D} = {C0C7DA58-C90D-4BDE-AE44-588997339F5D}
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060} = {C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D} = {C70D3509-57C4-4326-90C1-2EC0AE34848D}
-		{CAB69303-0F02-4C68-A12E-FFE55DB52526} = {CAB69303-0F02-4C68-A12E-FFE55DB52526}
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F} = {CE1426F6-7D2B-4574-9929-58387BF7B05F}
-		{D314F1B3-9299-4866-8362-08BF811B0FA3} = {D314F1B3-9299-4866-8362-08BF811B0FA3}
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB} = {DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}
-		{E07D267C-34C3-4DDB-8B41-94697808714A} = {E07D267C-34C3-4DDB-8B41-94697808714A}
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC} = {E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}
-		{E3DF045F-2174-4685-9CF7-0630A79F324B} = {E3DF045F-2174-4685-9CF7-0630A79F324B}
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {E7B11CF0-FE40-4A69-AE20-1B882F4D7585}
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94} = {F7790A54-4078-4E4A-8231-818BE9FB1F94}
-		{FA660037-EB40-4A43-AA9D-9653C57F2789} = {FA660037-EB40-4A43-AA9D-9653C57F2789}
 		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}
+		{FA660037-EB40-4A43-AA9D-9653C57F2789} = {FA660037-EB40-4A43-AA9D-9653C57F2789}
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94} = {F7790A54-4078-4E4A-8231-818BE9FB1F94}
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {E7B11CF0-FE40-4A69-AE20-1B882F4D7585}
+		{E3DF045F-2174-4685-9CF7-0630A79F324B} = {E3DF045F-2174-4685-9CF7-0630A79F324B}
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC} = {E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}
+		{E07D267C-34C3-4DDB-8B41-94697808714A} = {E07D267C-34C3-4DDB-8B41-94697808714A}
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB} = {DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}
+		{D314F1B3-9299-4866-8362-08BF811B0FA3} = {D314F1B3-9299-4866-8362-08BF811B0FA3}
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F} = {CE1426F6-7D2B-4574-9929-58387BF7B05F}
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}
+		{CAB69303-0F02-4C68-A12E-FFE55DB52526} = {CAB69303-0F02-4C68-A12E-FFE55DB52526}
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D} = {C70D3509-57C4-4326-90C1-2EC0AE34848D}
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060} = {C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D} = {C0C7DA58-C90D-4BDE-AE44-588997339F5D}
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9} = {C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}
+		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0} = {BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}
+		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F} = {B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}
+		{B2D715CE-4CBB-415A-A032-E700C90ADF91} = {B2D715CE-4CBB-415A-A032-E700C90ADF91}
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7} = {B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}
+		{AFF332BF-AF3D-4D35-86FC-42A727F01D36} = {AFF332BF-AF3D-4D35-86FC-42A727F01D36}
+		{A5C5D801-4026-49F2-BBF1-250941855306} = {A5C5D801-4026-49F2-BBF1-250941855306}
+		{A493331B-3180-49FE-8D0E-D121645E63AD} = {A493331B-3180-49FE-8D0E-D121645E63AD}
+		{A464166F-8507-49B4-9B02-5CB77C498B25} = {A464166F-8507-49B4-9B02-5CB77C498B25}
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4} = {A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}
+		{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
+		{9F53807E-9382-47BD-8371-E5D04F517E9C} = {9F53807E-9382-47BD-8371-E5D04F517E9C}
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA} = {9D13D9B8-6C28-42A7-935C-B769EBC55BAA}
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC} = {89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681} = {82F5BFE5-FDCE-47D4-8B38-BEEBED561681}
+		{80E37CB5-059D-4F4B-AEF6-08265468D368} = {80E37CB5-059D-4F4B-AEF6-08265468D368}
+		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2} = {7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}
+		{7D456640-3619-4D23-A56D-E0084400CCBF} = {7D456640-3619-4D23-A56D-E0084400CCBF}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F} = {7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF} = {65C78BBB-8FCB-48E4-94C8-1F0F981929AF}
+		{64D81334-DE73-457D-8FC1-9492508A2663} = {64D81334-DE73-457D-8FC1-9492508A2663}
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8} = {63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}
+		{5BDB7EE1-A1FD-410C-9598-21519A1B7952} = {5BDB7EE1-A1FD-410C-9598-21519A1B7952}
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196} = {5AEA4BF6-27CD-47FC-9370-D87771CFA196}
+		{4B60E8B8-416F-40B2-8A54-F75970A21992} = {4B60E8B8-416F-40B2-8A54-F75970A21992}
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A} = {3E6B24F6-9FA9-4066-859E-BF747FA3080A}
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8} = {3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF} = {3A932C39-AFA9-4BDC-B775-F71A426D04BF}
+		{34231B28-C51C-4C1C-AF07-C763668B1404} = {34231B28-C51C-4C1C-AF07-C763668B1404}
+		{32167995-4014-4E4C-983B-F7E17C24EB25} = {32167995-4014-4E4C-983B-F7E17C24EB25}
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25} = {300C6A09-663E-48B6-8E07-A0D50CAF8F25}
+		{2F914112-2657-49EC-8EA6-3BA63340DE27} = {2F914112-2657-49EC-8EA6-3BA63340DE27}
+		{275F2993-EE9B-4E00-9C85-10A182FD423A} = {275F2993-EE9B-4E00-9C85-10A182FD423A}
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9} = {256DECCE-9886-4C21-96A5-EE47DF5E07E9}
+		{228DD844-9926-420E-B193-6973BF2A4D0B} = {228DD844-9926-420E-B193-6973BF2A4D0B}
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290} = {226B3533-1FF3-42F6-A8E3-C4DDBC955290}
+		{21C76E6E-8B38-44D6-8148-B589C13B9554} = {21C76E6E-8B38-44D6-8148-B589C13B9554}
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94} = {182D578D-2DAC-4BB7-AFEC-9A2855E56F94}
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495} = {0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF} = {0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4} = {0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsdiff", "..\third_party\bsdiff\bsdiff.vcproj", "{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsdiff", "..\third_party\bsdiff\bsdiff.vcproj", "{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B} = {B84553C8-5676-427B-B3E4-23DDDC4DBC7B}
 		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0} = {D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B} = {B84553C8-5676-427B-B3E4-23DDDC4DBC7B}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bspatch", "..\third_party\bspatch\bspatch.vcproj", "{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bspatch", "..\third_party\bspatch\bspatch.vcproj", "{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer_unittests", "installer\util\installer_unittests.vcproj", "{903F8C1E-537A-4C9E-97BE-075147CBE769}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer_unittests", "installer\util\installer_unittests.vcproj", "{903F8C1E-537A-4C9E-97BE-075147CBE769}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "activex_shim_dll", "..\webkit\activex_shim_dll\activex_shim_dll.vcproj", "{494E414B-1655-48CE-996D-6413ECFB7829}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "activex_shim_dll", "..\webkit\activex_shim_dll\activex_shim_dll.vcproj", "{494E414B-1655-48CE-996D-6413ECFB7829}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "da", "app\locales\da.vcproj", "{A493331B-3180-49FE-8D0E-D121645E63AD}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "da", "app\locales\da.vcproj", "{A493331B-3180-49FE-8D0E-D121645E63AD}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
-	EndProjectSection
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "activex_test_control", "test\activex_test_control\activex_test_control.vcproj", "{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}"
@@ -1129,83 +1130,83 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt_config", "..\third_
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "default_plugin", "..\webkit\default_plugin\default_plugin.vcproj", "{5916D37D-8C97-424F-A904-74E52594C2D6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zh-TW", "app\locales\zh-TW.vcproj", "{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}"
 	ProjectSection(ProjectDependencies) = postProject
 		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zh-TW", "app\locales\zh-TW.vcproj", "{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "he", "app\locales\he.vcproj", "{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "he", "app\locales\he.vcproj", "{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chrome_plugin", "test\chrome_plugin\test_chrome_plugin.vcproj", "{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_chrome_plugin", "test\chrome_plugin\test_chrome_plugin.vcproj", "{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "automated_ui_tests", "test\automated_ui_tests\automated_ui_tests.vcproj", "{D2250C20-3A94-4FB9-AF73-11BC5B73884B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "automated_ui_tests", "test\automated_ui_tests\automated_ui_tests.vcproj", "{D2250C20-3A94-4FB9-AF73-11BC5B73884B}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mini_installer_test", "test\mini_installer_test\mini_installer_test.vcproj", "{4B6E199A-034A-49BD-AB93-458DD37E45B1}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mini_installer_test", "test\mini_installer_test\mini_installer_test.vcproj", "{4B6E199A-034A-49BD-AB93-458DD37E45B1}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore_pcre", "..\webkit\build\JavaScriptCore\JavaScriptCore_pcre.vcproj", "{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -1232,6 +1233,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ondemand_updates", "..\goog
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "terms", "terms", "{D13F055D-4428-48F4-ABF6-18359C76EDB0}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
 	ProjectSection(SolutionItems) = preProject
 		app\resources\terms\terms_ar.html = app\resources\terms\terms_ar.html
 		app\resources\terms\terms_bg.html = app\resources\terms\terms_bg.html
@@ -1285,553 +1290,549 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "terms", "terms", "{D13F055D
 		app\resources\terms\terms_zh-CN.html = app\resources\terms\terms_zh-CN.html
 		app\resources\terms\terms_zh-TW.html = app\resources\terms\terms_zh-TW.html
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ar", "app\locales\ar.vcproj", "{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ar", "app\locales\ar.vcproj", "{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bg", "app\locales\bg.vcproj", "{5BDB7EE1-A1FD-410C-9598-21519A1B7952}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bg", "app\locales\bg.vcproj", "{5BDB7EE1-A1FD-410C-9598-21519A1B7952}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ca", "app\locales\ca.vcproj", "{F7790A54-4078-4E4A-8231-818BE9FB1F94}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ca", "app\locales\ca.vcproj", "{F7790A54-4078-4E4A-8231-818BE9FB1F94}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cs", "app\locales\cs.vcproj", "{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cs", "app\locales\cs.vcproj", "{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "de", "app\locales\de.vcproj", "{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "de", "app\locales\de.vcproj", "{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "el", "app\locales\el.vcproj", "{D314F1B3-9299-4866-8362-08BF811B0FA3}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "el", "app\locales\el.vcproj", "{D314F1B3-9299-4866-8362-08BF811B0FA3}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "en-GB", "app\locales\en-GB.vcproj", "{34231B28-C51C-4C1C-AF07-C763668B1404}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "en-GB", "app\locales\en-GB.vcproj", "{34231B28-C51C-4C1C-AF07-C763668B1404}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "es", "app\locales\es.vcproj", "{5AEA4BF6-27CD-47FC-9370-D87771CFA196}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "es", "app\locales\es.vcproj", "{5AEA4BF6-27CD-47FC-9370-D87771CFA196}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "et", "app\locales\et.vcproj", "{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "et", "app\locales\et.vcproj", "{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fi", "app\locales\fi.vcproj", "{64D81334-DE73-457D-8FC1-9492508A2663}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fi", "app\locales\fi.vcproj", "{64D81334-DE73-457D-8FC1-9492508A2663}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fil", "app\locales\fil.vcproj", "{3A932C39-AFA9-4BDC-B775-F71A426D04BF}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fil", "app\locales\fil.vcproj", "{3A932C39-AFA9-4BDC-B775-F71A426D04BF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fr", "app\locales\fr.vcproj", "{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fr", "app\locales\fr.vcproj", "{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hi", "app\locales\hi.vcproj", "{228DD844-9926-420E-B193-6973BF2A4D0B}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hi", "app\locales\hi.vcproj", "{228DD844-9926-420E-B193-6973BF2A4D0B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hr", "app\locales\hr.vcproj", "{CE1426F6-7D2B-4574-9929-58387BF7B05F}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hr", "app\locales\hr.vcproj", "{CE1426F6-7D2B-4574-9929-58387BF7B05F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hu", "app\locales\hu.vcproj", "{AFF332BF-AF3D-4D35-86FC-42A727F01D36}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hu", "app\locales\hu.vcproj", "{AFF332BF-AF3D-4D35-86FC-42A727F01D36}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "id", "app\locales\id.vcproj", "{E3DF045F-2174-4685-9CF7-0630A79F324B}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "id", "app\locales\id.vcproj", "{E3DF045F-2174-4685-9CF7-0630A79F324B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "it", "app\locales\it.vcproj", "{275F2993-EE9B-4E00-9C85-10A182FD423A}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "it", "app\locales\it.vcproj", "{275F2993-EE9B-4E00-9C85-10A182FD423A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ja", "app\locales\ja.vcproj", "{B2D715CE-4CBB-415A-A032-E700C90ADF91}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ja", "app\locales\ja.vcproj", "{B2D715CE-4CBB-415A-A032-E700C90ADF91}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ko", "app\locales\ko.vcproj", "{32167995-4014-4E4C-983B-F7E17C24EB25}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ko", "app\locales\ko.vcproj", "{32167995-4014-4E4C-983B-F7E17C24EB25}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lt", "app\locales\lt.vcproj", "{80E37CB5-059D-4F4B-AEF6-08265468D368}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lt", "app\locales\lt.vcproj", "{80E37CB5-059D-4F4B-AEF6-08265468D368}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lv", "app\locales\lv.vcproj", "{A5C5D801-4026-49F2-BBF1-250941855306}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lv", "app\locales\lv.vcproj", "{A5C5D801-4026-49F2-BBF1-250941855306}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nl", "app\locales\nl.vcproj", "{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nl", "app\locales\nl.vcproj", "{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nb", "app\locales\nb.vcproj", "{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nb", "app\locales\nb.vcproj", "{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pl", "app\locales\pl.vcproj", "{9F53807E-9382-47BD-8371-E5D04F517E9C}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pl", "app\locales\pl.vcproj", "{9F53807E-9382-47BD-8371-E5D04F517E9C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pt-BR", "app\locales\pt-BR.vcproj", "{2F914112-2657-49EC-8EA6-3BA63340DE27}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pt-BR", "app\locales\pt-BR.vcproj", "{2F914112-2657-49EC-8EA6-3BA63340DE27}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pt-PT", "app\locales\pt-PT.vcproj", "{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pt-PT", "app\locales\pt-PT.vcproj", "{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ro", "app\locales\ro.vcproj", "{C70D3509-57C4-4326-90C1-2EC0AE34848D}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ro", "app\locales\ro.vcproj", "{C70D3509-57C4-4326-90C1-2EC0AE34848D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ru", "app\locales\ru.vcproj", "{7D456640-3619-4D23-A56D-E0084400CCBF}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ru", "app\locales\ru.vcproj", "{7D456640-3619-4D23-A56D-E0084400CCBF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sk", "app\locales\sk.vcproj", "{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sk", "app\locales\sk.vcproj", "{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sl", "app\locales\sl.vcproj", "{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sl", "app\locales\sl.vcproj", "{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sr", "app\locales\sr.vcproj", "{300C6A09-663E-48B6-8E07-A0D50CAF8F25}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sr", "app\locales\sr.vcproj", "{300C6A09-663E-48B6-8E07-A0D50CAF8F25}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "th", "app\locales\th.vcproj", "{226B3533-1FF3-42F6-A8E3-C4DDBC955290}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "th", "app\locales\th.vcproj", "{226B3533-1FF3-42F6-A8E3-C4DDBC955290}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sv", "app\locales\sv.vcproj", "{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sv", "app\locales\sv.vcproj", "{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tr", "app\locales\tr.vcproj", "{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tr", "app\locales\tr.vcproj", "{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uk", "app\locales\uk.vcproj", "{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uk", "app\locales\uk.vcproj", "{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vi", "app\locales\vi.vcproj", "{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vi", "app\locales\vi.vcproj", "{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zh-CN", "app\locales\zh-CN.vcproj", "{C0C7DA58-C90D-4BDE-AE44-588997339F5D}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zh-CN", "app\locales\zh-CN.vcproj", "{C0C7DA58-C90D-4BDE-AE44-588997339F5D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crash_service", "tools\crash_service\crash_service.vcproj", "{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crash_service", "tools\crash_service\crash_service.vcproj", "{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{9946A048-043B-4F8F-9E07-9297B204714C} = {9946A048-043B-4F8F-9E07-9297B204714C}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {B55CA863-B374-4BAF-95AC-539E4FA4C90C}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{9946A048-043B-4F8F-9E07-9297B204714C} = {9946A048-043B-4F8F-9E07-9297B204714C}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "memory_watcher", "..\tools\memory_watcher\memory_watcher.vcproj", "{3BD81303-4E14-4559-AA69-B30C3BAB08DD}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "memory_watcher", "..\tools\memory_watcher\memory_watcher.vcproj", "{3BD81303-4E14-4559-AA69-B30C3BAB08DD}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rlz", "..\rlz\rlz.vcproj", "{BF4F447B-72B5-4059-BE1B-F94337B1F385}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rlz", "..\rlz\rlz.vcproj", "{BF4F447B-72B5-4059-BE1B-F94337B1F385}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "es-419", "app\locales\es-419.vcproj", "{FA660037-EB40-4A43-AA9D-9653C57F2789}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "es-419", "app\locales\es-419.vcproj", "{FA660037-EB40-4A43-AA9D-9653C57F2789}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tab_switching_test", "test\tab_switching\tab_switching.vcproj", "{A34770EA-A574-43E8-9327-F79C04770E98}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tab_switching_test", "test\tab_switching\tab_switching.vcproj", "{A34770EA-A574-43E8-9327-F79C04770E98}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE} = {76235B67-1C27-4627-8A33-4B2E1EF93EDE}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {7B219FAA-E360-43C8-B341-804A94EEFFAC}
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE} = {76235B67-1C27-4627-8A33-4B2E1EF93EDE}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util_prebuild", "installer\util\prebuild\util_prebuild.vcproj", "{0026A376-C4F1-4575-A1BA-578C69F07013}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util_prebuild", "installer\util\prebuild\util_prebuild.vcproj", "{0026A376-C4F1-4575-A1BA-578C69F07013}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convert_dict", "tools\convert_dict\convert_dict.vcproj", "{42ECD5EC-722F-41DE-B6B8-83764C8016DF}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convert_dict", "tools\convert_dict\convert_dict.vcproj", "{42ECD5EC-722F-41DE-B6B8-83764C8016DF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
 		{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\testing\gtest.vcproj", "{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\testing\gtest.vcproj", "{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debugger", "browser\debugger\debugger.vcproj", "{57823D8C-A317-4713-9125-2C91FDFD12D6}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debugger", "browser\debugger\debugger.vcproj", "{57823D8C-A317-4713-9125-2C91FDFD12D6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "memory_test", "test\memory_test\memory_test.vcproj", "{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "memory_test", "test\memory_test\memory_test.vcproj", "{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_base", "..\v8\tools\visual_studio\v8_base.vcproj", "{EC8B7909-62AF-470D-A75D-E1D89C837142}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_base", "..\v8\tools\visual_studio\v8_base.vcproj", "{EC8B7909-62AF-470D-A75D-E1D89C837142}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8", "..\v8\tools\visual_studio\v8.vcproj", "{21E22961-22BF-4493-BD3A-868F93DA5179}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8", "..\v8\tools\visual_studio\v8.vcproj", "{21E22961-22BF-4493-BD3A-868F93DA5179}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_mksnapshot", "..\v8\tools\visual_studio\v8_mksnapshot.vcproj", "{865575D0-37E2-405E-8CBA-5F6C485B5A26}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_mksnapshot", "..\v8\tools\visual_studio\v8_mksnapshot.vcproj", "{865575D0-37E2-405E-8CBA-5F6C485B5A26}"
 	ProjectSection(ProjectDependencies) = postProject
 		{21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_snapshot", "..\v8\tools\visual_studio\v8_snapshot.vcproj", "{C0334F9A-1168-4101-9DD8-C30FB252D435}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_snapshot", "..\v8\tools\visual_studio\v8_snapshot.vcproj", "{C0334F9A-1168-4101-9DD8-C30FB252D435}"
 	ProjectSection(ProjectDependencies) = postProject
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26} = {865575D0-37E2-405E-8CBA-5F6C485B5A26}
 		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26} = {865575D0-37E2-405E-8CBA-5F6C485B5A26}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_views", "browser\views\browser_views.vcproj", "{FA537565-7B03-4FFC-AF15-F7A979B72E22}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_views", "browser\views\browser_views.vcproj", "{FA537565-7B03-4FFC-AF15-F7A979B72E22}"
 	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_shell_sample", "..\v8\tools\visual_studio\v8_shell_sample.vcproj", "{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_shell_sample", "..\v8\tools\visual_studio\v8_shell_sample.vcproj", "{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435}
 	EndProjectSection
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdch", "..\sdch\sdch.vcproj", "{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -1840,84 +1841,84 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdch", "..\sdch\sdch.vcproj
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kn", "app\locales\kn.vcproj", "{3E6B24F6-9FA9-4066-859E-BF747FA3080A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
-	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bn", "app\locales\bn.vcproj", "{4B60E8B8-416F-40B2-8A54-F75970A21992}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bn", "app\locales\bn.vcproj", "{4B60E8B8-416F-40B2-8A54-F75970A21992}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gu", "app\locales\gu.vcproj", "{256DECCE-9886-4C21-96A5-EE47DF5E07E9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gu", "app\locales\gu.vcproj", "{256DECCE-9886-4C21-96A5-EE47DF5E07E9}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml", "app\locales\ml.vcproj", "{CAB69303-0F02-4C68-A12E-FFE55DB52526}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml", "app\locales\ml.vcproj", "{CAB69303-0F02-4C68-A12E-FFE55DB52526}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mr", "app\locales\mr.vcproj", "{A464166F-8507-49B4-9B02-5CB77C498B25}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mr", "app\locales\mr.vcproj", "{A464166F-8507-49B4-9B02-5CB77C498B25}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "or", "app\locales\or.vcproj", "{E07D267C-34C3-4DDB-8B41-94697808714A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "or", "app\locales\or.vcproj", "{E07D267C-34C3-4DDB-8B41-94697808714A}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ta", "app\locales\ta.vcproj", "{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ta", "app\locales\ta.vcproj", "{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "te", "app\locales\te.vcproj", "{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}"
 	ProjectSection(ProjectDependencies) = postProject
-		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "te", "app\locales\te.vcproj", "{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
+	ProjectSection(ProjectDependencies) = postProject
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1927,86 +1928,38 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Win32.Build.0 = Debug|Win32
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Win32.ActiveCfg = Release|Win32
-		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Win32.Build.0 = Release|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Win32.Build.0 = Debug|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Win32.ActiveCfg = Release|Win32
-		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Win32.Build.0 = Release|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Win32.Build.0 = Debug|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Win32.ActiveCfg = Release|Win32
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Win32.Build.0 = Release|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Win32.Build.0 = Debug|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Win32.ActiveCfg = Release|Win32
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Win32.Build.0 = Release|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.Build.0 = Debug|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Win32.ActiveCfg = Release|Win32
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Win32.Build.0 = Release|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Win32.Build.0 = Debug|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Win32.ActiveCfg = Release|Win32
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Win32.Build.0 = Release|Win32
-		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Debug|Win32.Build.0 = Debug|Win32
-		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Release|Win32.ActiveCfg = Release|Win32
-		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Release|Win32.Build.0 = Release|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Win32.Build.0 = Debug|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Win32.ActiveCfg = Release|Win32
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Win32.Build.0 = Release|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Win32.ActiveCfg = Debug|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Win32.Build.0 = Debug|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Win32.ActiveCfg = Release|Win32
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Win32.Build.0 = Release|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Win32.Build.0 = Debug|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Win32.ActiveCfg = Release|Win32
-		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Win32.Build.0 = Release|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Win32.Build.0 = Debug|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Win32.ActiveCfg = Release|Win32
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Win32.Build.0 = Release|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Win32.Build.0 = Debug|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Win32.ActiveCfg = Release|Win32
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Win32.Build.0 = Release|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Win32.Build.0 = Debug|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Win32.ActiveCfg = Release|Win32
+		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Win32.Build.0 = Release|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Win32.ActiveCfg = Debug|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Win32.Build.0 = Debug|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Win32.ActiveCfg = Release|Win32
+		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Win32.Build.0 = Release|Win32
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2015,45 +1968,94 @@ Global
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.ActiveCfg = Release|Win32
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.Build.0 = Release|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Win32.Build.0 = Debug|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Win32.ActiveCfg = Release|Win32
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Win32.Build.0 = Release|Win32
-		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Debug|Win32.ActiveCfg = Debug|Win32
-		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Win32.ActiveCfg = Release|Win32
-		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Win32.Build.0 = Release|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Win32.ActiveCfg = Debug|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Win32.Build.0 = Debug|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Win32.ActiveCfg = Release|Win32
-		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Win32.Build.0 = Release|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Win32.ActiveCfg = Debug|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Win32.Build.0 = Debug|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Win32.ActiveCfg = Release|Win32
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Win32.Build.0 = Release|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Win32.Build.0 = Debug|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Win32.ActiveCfg = Release|Win32
-		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Win32.Build.0 = Release|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.Build.0 = Debug|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Win32.ActiveCfg = Release|Win32
+		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Win32.Build.0 = Release|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Win32.Build.0 = Debug|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Win32.ActiveCfg = Release|Win32
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Win32.Build.0 = Release|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Win32.Build.0 = Debug|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Win32.ActiveCfg = Release|Win32
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Win32.Build.0 = Release|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Win32.Build.0 = Debug|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Win32.ActiveCfg = Release|Win32
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Win32.Build.0 = Release|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Win32.Build.0 = Debug|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Win32.ActiveCfg = Release|Win32
+		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Win32.Build.0 = Release|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Win32.Build.0 = Debug|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Win32.ActiveCfg = Release|Win32
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Release|Win32.Build.0 = Release|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.Build.0 = Debug|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Win32.ActiveCfg = Release|Win32
+		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Win32.Build.0 = Release|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Win32.Build.0 = Debug|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Win32.ActiveCfg = Release|Win32
+		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Win32.Build.0 = Release|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Win32.Build.0 = Debug|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Win32.ActiveCfg = Release|Win32
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Win32.Build.0 = Release|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Win32.Build.0 = Debug|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Win32.ActiveCfg = Release|Win32
+		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Win32.Build.0 = Release|Win32
 		{238CE175-76CE-4A25-A676-69D115885601}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{238CE175-76CE-4A25-A676-69D115885601}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{238CE175-76CE-4A25-A676-69D115885601}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2062,34 +2064,86 @@ Global
 		{238CE175-76CE-4A25-A676-69D115885601}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{238CE175-76CE-4A25-A676-69D115885601}.Release|Win32.ActiveCfg = Release|Win32
 		{238CE175-76CE-4A25-A676-69D115885601}.Release|Win32.Build.0 = Release|Win32
-		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Win32.ActiveCfg = Release|Win32
-		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Win32.Build.0 = Release|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Win32.Build.0 = Debug|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Win32.ActiveCfg = Release|Win32
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Win32.Build.0 = Release|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Win32.Build.0 = Debug|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Win32.ActiveCfg = Release|Win32
-		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Win32.Build.0 = Release|Win32
-		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Release|Win32.ActiveCfg = Release|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Win32.ActiveCfg = Debug|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Win32.Build.0 = Debug|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Win32.ActiveCfg = Release|Win32
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Win32.Build.0 = Release|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Win32.Build.0 = Debug|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Win32.ActiveCfg = Release|Win32
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Win32.Build.0 = Release|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Win32.Build.0 = Debug|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Win32.ActiveCfg = Release|Win32
+		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Win32.Build.0 = Release|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Win32.Build.0 = Debug|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Win32.ActiveCfg = Release|Win32
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Win32.Build.0 = Release|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Win32.Build.0 = Debug|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Win32.ActiveCfg = Release|Win32
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Win32.Build.0 = Release|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Win32.Build.0 = Debug|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Win32.ActiveCfg = Release|Win32
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Win32.Build.0 = Release|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Win32.Build.0 = Debug|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Win32.ActiveCfg = Release|Win32
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Win32.Build.0 = Release|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Win32.Build.0 = Debug|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Win32.ActiveCfg = Release|Win32
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Win32.Build.0 = Release|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Win32.Build.0 = Debug|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Win32.ActiveCfg = Release|Win32
+		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Win32.Build.0 = Release|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Win32.Build.0 = Debug|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Win32.ActiveCfg = Release|Win32
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Win32.Build.0 = Release|Win32
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2098,22 +2152,100 @@ Global
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Release|Win32.ActiveCfg = Release|Win32
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Release|Win32.Build.0 = Release|Win32
-		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Debug|Win32.Build.0 = Debug|Win32
-		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Release|Win32.ActiveCfg = Release|Win32
-		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Release|Win32.Build.0 = Release|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Win32.Build.0 = Debug|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Win32.ActiveCfg = Release|Win32
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Win32.Build.0 = Release|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Win32.Build.0 = Debug|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Win32.ActiveCfg = Release|Win32
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Win32.Build.0 = Release|Win32
+		{FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Win32.ActiveCfg = Release|Win32
+		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Win32.Build.0 = Release|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Debug|Win32.Build.0 = Debug|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Win32.ActiveCfg = Release|Win32
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}.Release|Win32.Build.0 = Release|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Win32.Build.0 = Debug|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Win32.ActiveCfg = Release|Win32
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Win32.Build.0 = Release|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Win32.Build.0 = Debug|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Win32.ActiveCfg = Release|Win32
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Win32.Build.0 = Release|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Win32.Build.0 = Debug|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Win32.ActiveCfg = Release|Win32
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Win32.Build.0 = Release|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Win32.Build.0 = Debug|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Win32.ActiveCfg = Release|Win32
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Win32.Build.0 = Release|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Win32.Build.0 = Debug|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Win32.ActiveCfg = Release|Win32
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Win32.Build.0 = Release|Win32
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Win32.ActiveCfg = Release|Win32
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Win32.Build.0 = Release|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Win32.Build.0 = Debug|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Win32.ActiveCfg = Release|Win32
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Win32.Build.0 = Release|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Win32.Build.0 = Debug|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Win32.ActiveCfg = Release|Win32
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Win32.Build.0 = Release|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Win32.ActiveCfg = Debug|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Win32.Build.0 = Debug|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Win32.ActiveCfg = Release|Win32
+		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Win32.Build.0 = Release|Win32
 		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2122,124 +2254,83 @@ Global
 		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}.Release|Win32.ActiveCfg = Release|Win32
 		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}.Release|Win32.Build.0 = Release|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Win32.Build.0 = Debug|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.ActiveCfg = Release|Win32
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.Build.0 = Release|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Win32.Build.0 = Debug|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Win32.ActiveCfg = Release|Win32
-		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Win32.Build.0 = Release|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Win32.ActiveCfg = Debug|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Win32.Build.0 = Debug|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Win32.ActiveCfg = Release|Win32
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Win32.Build.0 = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Win32.ActiveCfg = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Win32.Build.0 = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Win32.ActiveCfg = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Win32.Build.0 = Release|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Win32.ActiveCfg = Debug|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Win32.Build.0 = Debug|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Win32.ActiveCfg = Release|Win32
-		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Win32.Build.0 = Release|Win32
-		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Win32.ActiveCfg = Debug|Win32
-		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Win32.Build.0 = Debug|Win32
-		{326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Win32.ActiveCfg = Release|Win32
-		{326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Win32.Build.0 = Release|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Win32.ActiveCfg = Debug|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Win32.Build.0 = Debug|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Win32.ActiveCfg = Release|Win32
-		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Win32.Build.0 = Release|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Win32.Build.0 = Debug|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Win32.ActiveCfg = Release|Win32
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Win32.Build.0 = Release|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Win32.Build.0 = Debug|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Win32.ActiveCfg = Release|Win32
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Win32.Build.0 = Release|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Win32.Build.0 = Debug|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Win32.ActiveCfg = Release|Win32
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Win32.Build.0 = Release|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Win32.Build.0 = Debug|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Win32.ActiveCfg = Release|Win32
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Win32.Build.0 = Release|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Win32.Build.0 = Debug|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Win32.ActiveCfg = Release|Win32
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Win32.Build.0 = Release|Win32
-		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Debug|Win32.Build.0 = Debug|Win32
-		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Release|Win32.ActiveCfg = Release|Win32
-		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Release|Win32.Build.0 = Release|Win32
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Win32.ActiveCfg = Release|Win32
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Win32.Build.0 = Release|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Win32.Build.0 = Debug|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Win32.ActiveCfg = Release|Win32
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673}.Release|Win32.Build.0 = Release|Win32
 		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{41735CD9-3E35-47F7-9FD1-4A9950B6B131}.Release|Win32.ActiveCfg = Release|Any CPU
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Win32.Build.0 = Debug|Win32
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Win32.ActiveCfg = Release|Win32
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Win32.Build.0 = Release|Win32
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Win32.Build.0 = Debug|Win32
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Win32.ActiveCfg = Release|Win32
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Win32.Build.0 = Release|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Win32.Build.0 = Debug|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Win32.ActiveCfg = Release|Win32
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Win32.Build.0 = Release|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Win32.Build.0 = Debug|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Win32.ActiveCfg = Release|Win32
+		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Win32.Build.0 = Release|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Win32.Build.0 = Debug|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Win32.ActiveCfg = Release|Win32
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Win32.Build.0 = Release|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Win32.Build.0 = Debug|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Win32.ActiveCfg = Release|Win32
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Win32.Build.0 = Release|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Win32.Build.0 = Debug|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Win32.ActiveCfg = Release|Win32
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Win32.Build.0 = Release|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.Build.0 = Debug|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Win32.ActiveCfg = Release|Win32
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Win32.Build.0 = Release|Win32
 		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2248,6 +2339,157 @@ Global
 		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Release|Win32.ActiveCfg = Release|Win32
 		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657}.Release|Win32.Build.0 = Release|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Win32.Build.0 = Debug|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Win32.ActiveCfg = Release|Win32
+		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Win32.Build.0 = Release|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Win32.Build.0 = Debug|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Win32.ActiveCfg = Release|Win32
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Win32.Build.0 = Release|Win32
+		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Win32.ActiveCfg = Debug|Win32
+		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Win32.Build.0 = Debug|Win32
+		{326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Win32.ActiveCfg = Release|Win32
+		{326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Win32.Build.0 = Release|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Win32.Build.0 = Debug|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Win32.ActiveCfg = Release|Win32
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Win32.Build.0 = Release|Win32
+		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Release|Win32.ActiveCfg = Release|Win32
+		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Release|Win32.ActiveCfg = Release|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Win32.Build.0 = Debug|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Win32.ActiveCfg = Release|Win32
+		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Win32.Build.0 = Release|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Win32.Build.0 = Debug|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Win32.ActiveCfg = Release|Win32
+		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Win32.Build.0 = Release|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Debug|Win32.Build.0 = Debug|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Win32.ActiveCfg = Release|Win32
+		{1832A374-8A74-4F9E-B536-69A699B3E165}.Release|Win32.Build.0 = Release|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Win32.Build.0 = Debug|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Win32.ActiveCfg = Release|Win32
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Win32.Build.0 = Release|Win32
+		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Debug|Win32.Build.0 = Debug|Win32
+		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Release|Win32.ActiveCfg = Release|Win32
+		{0E5474AC-5996-4B13-87C0-4AE931EE0815}.Release|Win32.Build.0 = Release|Win32
+		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}.Release|Win32.ActiveCfg = Release|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Win32.Build.0 = Debug|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Win32.ActiveCfg = Release|Win32
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Win32.Build.0 = Release|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Debug|Win32.Build.0 = Debug|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Win32.ActiveCfg = Release|Win32
+		{018D4F38-6272-448F-A864-976DA09F05D0}.Release|Win32.Build.0 = Release|Win32
+		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Debug|Win32.ActiveCfg = Debug|Win32
+		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Win32.ActiveCfg = Release|Win32
+		{21C76E6E-8B38-44D6-8148-B589C13B9554}.Release|Win32.Build.0 = Release|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Win32.Build.0 = Debug|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Win32.ActiveCfg = Release|Win32
+		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Win32.Build.0 = Release|Win32
+		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Win32.ActiveCfg = Release|Win32
+		{24A5AC7C-280B-4899-9153-6BA570A081E7}.Release|Win32.Build.0 = Release|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Win32.Build.0 = Debug|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Win32.ActiveCfg = Release|Win32
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Win32.Build.0 = Release|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Win32.Build.0 = Debug|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Win32.ActiveCfg = Release|Win32
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Win32.Build.0 = Release|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Win32.ActiveCfg = Debug|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Win32.Build.0 = Debug|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Win32.ActiveCfg = Release|Win32
+		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Win32.Build.0 = Release|Win32
 		{494E414B-1655-48CE-996D-6413ECFB7829}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{494E414B-1655-48CE-996D-6413ECFB7829}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{494E414B-1655-48CE-996D-6413ECFB7829}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2256,29 +2498,30 @@ Global
 		{494E414B-1655-48CE-996D-6413ECFB7829}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{494E414B-1655-48CE-996D-6413ECFB7829}.Release|Win32.ActiveCfg = Release|Win32
 		{494E414B-1655-48CE-996D-6413ECFB7829}.Release|Win32.Build.0 = Release|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Win32.ActiveCfg = Debug|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Win32.Build.0 = Debug|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Win32.ActiveCfg = Release|Win32
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Win32.Build.0 = Release|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Win32.Build.0 = Debug|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Win32.ActiveCfg = Release|Win32
-		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Win32.Build.0 = Release|Win32
-		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Win32.ActiveCfg = Release|Win32
-		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Win32.Build.0 = Release|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Win32.Build.0 = Debug|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Win32.ActiveCfg = Release|Win32
+		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Win32.Build.0 = Release|Win32
+		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Debug|Win32.Build.0 = Debug|Win32
+		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Release|Win32.ActiveCfg = Release|Win32
+		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}.Release|Win32.Build.0 = Release|Win32
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Win32.ActiveCfg = Debug|Win32
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Win32.Build.0 = Debug|Win32
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Win32.ActiveCfg = Release|Win32
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Win32.Build.0 = Release|Win32
 		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2287,30 +2530,6 @@ Global
 		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Win32.ActiveCfg = Release|Win32
 		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Win32.Build.0 = Release|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Win32.ActiveCfg = Debug|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Win32.Build.0 = Debug|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Win32.ActiveCfg = Release|Win32
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Win32.Build.0 = Release|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.Build.0 = Debug|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Win32.ActiveCfg = Release|Win32
-		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Win32.Build.0 = Release|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Win32.Build.0 = Debug|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Win32.ActiveCfg = Release|Win32
-		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Win32.Build.0 = Release|Win32
 		{5916D37D-8C97-424F-A904-74E52594C2D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{5916D37D-8C97-424F-A904-74E52594C2D6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{5916D37D-8C97-424F-A904-74E52594C2D6}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2319,14 +2538,85 @@ Global
 		{5916D37D-8C97-424F-A904-74E52594C2D6}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{5916D37D-8C97-424F-A904-74E52594C2D6}.Release|Win32.ActiveCfg = Release|Win32
 		{5916D37D-8C97-424F-A904-74E52594C2D6}.Release|Win32.Build.0 = Release|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Win32.Build.0 = Debug|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Win32.ActiveCfg = Release|Win32
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Win32.Build.0 = Release|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Win32.Build.0 = Debug|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Win32.ActiveCfg = Release|Win32
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Win32.Build.0 = Release|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Win32.Build.0 = Debug|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Win32.ActiveCfg = Release|Win32
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Win32.Build.0 = Release|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Win32.Build.0 = Debug|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Win32.ActiveCfg = Release|Win32
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Win32.Build.0 = Release|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Win32.Build.0 = Debug|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Win32.ActiveCfg = Release|Win32
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Win32.Build.0 = Release|Win32
+		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Win32.ActiveCfg = Release|Win32
+		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Win32.Build.0 = Release|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Win32.ActiveCfg = Debug|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Win32.Build.0 = Debug|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Win32.ActiveCfg = Release|Win32
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Win32.Build.0 = Release|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Win32.Build.0 = Debug|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.ActiveCfg = Release|Win32
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.Build.0 = Release|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Win32.Build.0 = Debug|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Win32.ActiveCfg = Release|Win32
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Win32.Build.0 = Release|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Debug|Win32.Build.0 = Debug|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Win32.ActiveCfg = Release|Win32
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35}.Release|Win32.Build.0 = Release|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Debug|Win32.Build.0 = Debug|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Win32.ActiveCfg = Release|Win32
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}.Release|Win32.Build.0 = Release|Win32
 		{5BDB7EE1-A1FD-410C-9598-21519A1B7952}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{5BDB7EE1-A1FD-410C-9598-21519A1B7952}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{5BDB7EE1-A1FD-410C-9598-21519A1B7952}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2335,118 +2625,14 @@ Global
 		{5BDB7EE1-A1FD-410C-9598-21519A1B7952}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{5BDB7EE1-A1FD-410C-9598-21519A1B7952}.Release|Win32.ActiveCfg = Release|Win32
 		{5BDB7EE1-A1FD-410C-9598-21519A1B7952}.Release|Win32.Build.0 = Release|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Debug|Win32.Build.0 = Debug|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Win32.ActiveCfg = Release|Win32
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}.Release|Win32.Build.0 = Release|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Debug|Win32.Build.0 = Debug|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Win32.ActiveCfg = Release|Win32
-		{60B43839-95E6-4526-A661-209F16335E0E}.Release|Win32.Build.0 = Release|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Win32.Build.0 = Debug|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Win32.ActiveCfg = Release|Win32
-		{625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Win32.Build.0 = Release|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Win32.Build.0 = Debug|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Win32.ActiveCfg = Release|Win32
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Win32.Build.0 = Release|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Win32.ActiveCfg = Debug|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Win32.Build.0 = Debug|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Win32.ActiveCfg = Release|Win32
-		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Win32.Build.0 = Release|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Win32.Build.0 = Debug|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Win32.ActiveCfg = Release|Win32
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Win32.Build.0 = Release|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Debug|Win32.Build.0 = Debug|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Win32.ActiveCfg = Release|Win32
-		{6AE76406-B03B-11DD-94B1-80B556D89593}.Release|Win32.Build.0 = Release|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Debug|Win32.Build.0 = Debug|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Win32.ActiveCfg = Release|Win32
-		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}.Release|Win32.Build.0 = Release|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Debug|Win32.Build.0 = Debug|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Win32.ActiveCfg = Release|Win32
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751}.Release|Win32.Build.0 = Release|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Debug|Win32.Build.0 = Debug|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Win32.ActiveCfg = Release|Win32
-		{7100F41F-868D-4E99-80A2-AF8E6574749D}.Release|Win32.Build.0 = Release|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Debug|Win32.Build.0 = Debug|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Win32.ActiveCfg = Release|Win32
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Win32.Build.0 = Release|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Win32.Build.0 = Debug|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Win32.ActiveCfg = Release|Win32
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Win32.Build.0 = Release|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Debug|Win32.Build.0 = Debug|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Win32.ActiveCfg = Release|Win32
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC}.Release|Win32.Build.0 = Release|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Win32.Build.0 = Debug|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Win32.ActiveCfg = Release|Win32
-		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Win32.Build.0 = Release|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Win32.Build.0 = Debug|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Win32.ActiveCfg = Release|Win32
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Win32.Build.0 = Release|Win32
 		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2455,220 +2641,86 @@ Global
 		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}.Release|Win32.ActiveCfg = Release|Win32
 		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}.Release|Win32.Build.0 = Release|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Debug|Win32.Build.0 = Debug|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Win32.ActiveCfg = Release|Win32
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4}.Release|Win32.Build.0 = Release|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Win32.ActiveCfg = Debug|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Win32.Build.0 = Debug|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Win32.ActiveCfg = Release|Win32
-		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Win32.Build.0 = Release|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Win32.ActiveCfg = Debug|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Win32.Build.0 = Debug|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Win32.ActiveCfg = Release|Win32
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Win32.Build.0 = Release|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Win32.Build.0 = Debug|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Win32.ActiveCfg = Release|Win32
-		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Win32.Build.0 = Release|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Win32.ActiveCfg = Debug|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Win32.Build.0 = Debug|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Win32.ActiveCfg = Release|Win32
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Win32.Build.0 = Release|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Win32.ActiveCfg = Debug|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Debug|Win32.Build.0 = Debug|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Win32.ActiveCfg = Release|Win32
-		{881F6A97-D539-4C48-B401-DF04385B2343}.Release|Win32.Build.0 = Release|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Win32.ActiveCfg = Debug|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Debug|Win32.Build.0 = Debug|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Win32.ActiveCfg = Release|Win32
-		{899F1280-3441-4D1F-BA04-CCD6208D9146}.Release|Win32.Build.0 = Release|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Win32.Build.0 = Debug|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Win32.ActiveCfg = Release|Win32
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Win32.Build.0 = Release|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Debug|Win32.Build.0 = Debug|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Win32.ActiveCfg = Release|Win32
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A}.Release|Win32.Build.0 = Release|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.Build.0 = Debug|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Win32.ActiveCfg = Release|Win32
-		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Win32.Build.0 = Release|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Win32.ActiveCfg = Debug|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Debug|Win32.Build.0 = Debug|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Win32.ActiveCfg = Release|Win32
-		{903F8C1E-537A-4C9E-97BE-075147CBE769}.Release|Win32.Build.0 = Release|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Debug|Win32.Build.0 = Debug|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Win32.ActiveCfg = Release|Win32
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F}.Release|Win32.Build.0 = Release|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Debug|Win32.Build.0 = Debug|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Win32.ActiveCfg = Release|Win32
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D}.Release|Win32.Build.0 = Release|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Debug|Win32.Build.0 = Debug|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Win32.ActiveCfg = Release|Win32
-		{9946A048-043B-4F8F-9E07-9297B204714C}.Release|Win32.Build.0 = Release|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Win32.Build.0 = Debug|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Win32.ActiveCfg = Release|Win32
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Win32.Build.0 = Release|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Win32.Build.0 = Debug|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Win32.ActiveCfg = Release|Win32
-		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Win32.Build.0 = Release|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Debug|Win32.Build.0 = Debug|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Win32.ActiveCfg = Release|Win32
-		{A0D94973-D355-47A5-A1E2-3456F321F010}.Release|Win32.Build.0 = Release|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Debug|Win32.Build.0 = Debug|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Win32.ActiveCfg = Release|Win32
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}.Release|Win32.Build.0 = Release|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Debug|Win32.Build.0 = Debug|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Win32.ActiveCfg = Release|Win32
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}.Release|Win32.Build.0 = Release|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Win32.Build.0 = Debug|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Win32.ActiveCfg = Release|Win32
-		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Win32.Build.0 = Release|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Win32.Build.0 = Debug|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Win32.ActiveCfg = Release|Win32
-		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Win32.Build.0 = Release|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Debug|Win32.Build.0 = Debug|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Win32.ActiveCfg = Release|Win32
-		{A493331B-3180-49FE-8D0E-D121645E63AD}.Release|Win32.Build.0 = Release|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Debug|Win32.Build.0 = Debug|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Win32.ActiveCfg = Release|Win32
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551}.Release|Win32.Build.0 = Release|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Win32.Build.0 = Debug|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Win32.ActiveCfg = Release|Win32
-		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Win32.Build.0 = Release|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Win32.Build.0 = Debug|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Win32.ActiveCfg = Release|Win32
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Win32.Build.0 = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32
-		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73}.Release|Win32.ActiveCfg = Release|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Win32.Build.0 = Debug|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Win32.ActiveCfg = Release|Win32
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Win32.Build.0 = Release|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Win32.Build.0 = Debug|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Win32.ActiveCfg = Release|Win32
+		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Win32.Build.0 = Release|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Win32.ActiveCfg = Debug|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Debug|Win32.Build.0 = Debug|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Win32.ActiveCfg = Release|Win32
+		{34231B28-C51C-4C1C-AF07-C763668B1404}.Release|Win32.Build.0 = Release|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Debug|Win32.Build.0 = Debug|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Win32.ActiveCfg = Release|Win32
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196}.Release|Win32.Build.0 = Release|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Debug|Win32.Build.0 = Debug|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Win32.ActiveCfg = Release|Win32
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}.Release|Win32.Build.0 = Release|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Win32.ActiveCfg = Debug|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Debug|Win32.Build.0 = Debug|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Win32.ActiveCfg = Release|Win32
+		{64D81334-DE73-457D-8FC1-9492508A2663}.Release|Win32.Build.0 = Release|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Debug|Win32.Build.0 = Debug|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Win32.ActiveCfg = Release|Win32
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF}.Release|Win32.Build.0 = Release|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Debug|Win32.Build.0 = Debug|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Win32.ActiveCfg = Release|Win32
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Win32.Build.0 = Release|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Debug|Win32.Build.0 = Debug|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Win32.ActiveCfg = Release|Win32
+		{228DD844-9926-420E-B193-6973BF2A4D0B}.Release|Win32.Build.0 = Release|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Win32.Build.0 = Debug|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Win32.ActiveCfg = Release|Win32
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Win32.Build.0 = Release|Win32
 		{AFF332BF-AF3D-4D35-86FC-42A727F01D36}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{AFF332BF-AF3D-4D35-86FC-42A727F01D36}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{AFF332BF-AF3D-4D35-86FC-42A727F01D36}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2677,14 +2729,22 @@ Global
 		{AFF332BF-AF3D-4D35-86FC-42A727F01D36}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{AFF332BF-AF3D-4D35-86FC-42A727F01D36}.Release|Win32.ActiveCfg = Release|Win32
 		{AFF332BF-AF3D-4D35-86FC-42A727F01D36}.Release|Win32.Build.0 = Release|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Win32.Build.0 = Debug|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Win32.ActiveCfg = Release|Win32
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Win32.Build.0 = Release|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Win32.Build.0 = Debug|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Win32.ActiveCfg = Release|Win32
+		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Win32.Build.0 = Release|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Debug|Win32.Build.0 = Debug|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Win32.ActiveCfg = Release|Win32
+		{275F2993-EE9B-4E00-9C85-10A182FD423A}.Release|Win32.Build.0 = Release|Win32
 		{B2D715CE-4CBB-415A-A032-E700C90ADF91}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{B2D715CE-4CBB-415A-A032-E700C90ADF91}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{B2D715CE-4CBB-415A-A032-E700C90ADF91}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2693,6 +2753,38 @@ Global
 		{B2D715CE-4CBB-415A-A032-E700C90ADF91}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{B2D715CE-4CBB-415A-A032-E700C90ADF91}.Release|Win32.ActiveCfg = Release|Win32
 		{B2D715CE-4CBB-415A-A032-E700C90ADF91}.Release|Win32.Build.0 = Release|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Win32.ActiveCfg = Debug|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Win32.Build.0 = Debug|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Win32.ActiveCfg = Release|Win32
+		{32167995-4014-4E4C-983B-F7E17C24EB25}.Release|Win32.Build.0 = Release|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Win32.ActiveCfg = Debug|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Debug|Win32.Build.0 = Debug|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Win32.ActiveCfg = Release|Win32
+		{80E37CB5-059D-4F4B-AEF6-08265468D368}.Release|Win32.Build.0 = Release|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Debug|Win32.Build.0 = Debug|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Win32.ActiveCfg = Release|Win32
+		{A5C5D801-4026-49F2-BBF1-250941855306}.Release|Win32.Build.0 = Release|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Win32.Build.0 = Debug|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Win32.ActiveCfg = Release|Win32
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Release|Win32.Build.0 = Release|Win32
 		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2701,54 +2793,134 @@ Global
 		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}.Release|Win32.ActiveCfg = Release|Win32
 		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}.Release|Win32.Build.0 = Release|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Debug|Win32.Build.0 = Debug|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Win32.ActiveCfg = Release|Win32
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C}.Release|Win32.Build.0 = Release|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Debug|Win32.Build.0 = Debug|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Win32.ActiveCfg = Release|Win32
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}.Release|Win32.Build.0 = Release|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Debug|Win32.Build.0 = Debug|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Win32.ActiveCfg = Release|Win32
-		{B92AE829-E1CD-4781-824A-DCB1603A1672}.Release|Win32.Build.0 = Release|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Debug|Win32.Build.0 = Debug|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Win32.ActiveCfg = Release|Win32
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}.Release|Win32.Build.0 = Release|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Debug|Win32.Build.0 = Debug|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Win32.ActiveCfg = Release|Win32
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}.Release|Win32.Build.0 = Release|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Debug|Win32.Build.0 = Debug|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Win32.ActiveCfg = Release|Win32
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C}.Release|Win32.Build.0 = Release|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Win32.Build.0 = Debug|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Win32.ActiveCfg = Release|Win32
+		{9F53807E-9382-47BD-8371-E5D04F517E9C}.Release|Win32.Build.0 = Release|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Win32.Build.0 = Debug|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Win32.ActiveCfg = Release|Win32
+		{2F914112-2657-49EC-8EA6-3BA63340DE27}.Release|Win32.Build.0 = Release|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Debug|Win32.Build.0 = Debug|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Win32.ActiveCfg = Release|Win32
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Win32.Build.0 = Release|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Win32.Build.0 = Debug|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Win32.ActiveCfg = Release|Win32
+		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Win32.Build.0 = Release|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Debug|Win32.Build.0 = Debug|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Win32.ActiveCfg = Release|Win32
+		{7D456640-3619-4D23-A56D-E0084400CCBF}.Release|Win32.Build.0 = Release|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Win32.ActiveCfg = Debug|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Debug|Win32.Build.0 = Debug|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Win32.ActiveCfg = Release|Win32
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}.Release|Win32.Build.0 = Release|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Win32.Build.0 = Debug|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Win32.ActiveCfg = Release|Win32
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Win32.Build.0 = Release|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Win32.ActiveCfg = Debug|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Debug|Win32.Build.0 = Debug|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Win32.ActiveCfg = Release|Win32
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Win32.Build.0 = Release|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Win32.ActiveCfg = Debug|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Debug|Win32.Build.0 = Debug|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Win32.ActiveCfg = Release|Win32
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290}.Release|Win32.Build.0 = Release|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Debug|Win32.Build.0 = Debug|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Win32.ActiveCfg = Release|Win32
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}.Release|Win32.Build.0 = Release|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Debug|Win32.Build.0 = Debug|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Win32.ActiveCfg = Release|Win32
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}.Release|Win32.Build.0 = Release|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Win32.ActiveCfg = Debug|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Debug|Win32.Build.0 = Debug|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Win32.ActiveCfg = Release|Win32
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}.Release|Win32.Build.0 = Release|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Win32.Build.0 = Debug|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Win32.ActiveCfg = Release|Win32
+		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Win32.Build.0 = Release|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Win32.Build.0 = Debug|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Win32.ActiveCfg = Release|Win32
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Win32.Build.0 = Release|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Debug|Win32.Build.0 = Debug|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Win32.ActiveCfg = Release|Win32
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC}.Release|Win32.Build.0 = Release|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Debug|Win32.Build.0 = Debug|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Win32.ActiveCfg = Release|Win32
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD}.Release|Win32.Build.0 = Release|Win32
 		{BF4F447B-72B5-4059-BE1B-F94337B1F385}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{BF4F447B-72B5-4059-BE1B-F94337B1F385}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{BF4F447B-72B5-4059-BE1B-F94337B1F385}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2757,6 +2929,38 @@ Global
 		{BF4F447B-72B5-4059-BE1B-F94337B1F385}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{BF4F447B-72B5-4059-BE1B-F94337B1F385}.Release|Win32.ActiveCfg = Release|Win32
 		{BF4F447B-72B5-4059-BE1B-F94337B1F385}.Release|Win32.Build.0 = Release|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Win32.Build.0 = Debug|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Win32.ActiveCfg = Release|Win32
+		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Win32.Build.0 = Release|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Debug|Win32.Build.0 = Debug|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Win32.ActiveCfg = Release|Win32
+		{A34770EA-A574-43E8-9327-F79C04770E98}.Release|Win32.Build.0 = Release|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Debug|Win32.Build.0 = Debug|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Win32.ActiveCfg = Release|Win32
+		{0026A376-C4F1-4575-A1BA-578C69F07013}.Release|Win32.Build.0 = Release|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Debug|Win32.Build.0 = Debug|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Win32.ActiveCfg = Release|Win32
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF}.Release|Win32.Build.0 = Release|Win32
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2765,6 +2969,46 @@ Global
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}.Release|Win32.ActiveCfg = Release|Win32
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}.Release|Win32.Build.0 = Release|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Win32.Build.0 = Debug|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Win32.ActiveCfg = Release|Win32
+		{57823D8C-A317-4713-9125-2C91FDFD12D6}.Release|Win32.Build.0 = Release|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Debug|Win32.Build.0 = Debug|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Win32.ActiveCfg = Release|Win32
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE}.Release|Win32.Build.0 = Release|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Win32.Build.0 = Debug|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Win32.ActiveCfg = Release|Win32
+		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Win32.Build.0 = Release|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Win32.ActiveCfg = Debug|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Debug|Win32.Build.0 = Debug|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Win32.ActiveCfg = Release|Win32
+		{21E22961-22BF-4493-BD3A-868F93DA5179}.Release|Win32.Build.0 = Release|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Win32.ActiveCfg = Debug|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Win32.Build.0 = Debug|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Win32.ActiveCfg = Release|Win32
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Win32.Build.0 = Release|Win32
 		{C0334F9A-1168-4101-9DD8-C30FB252D435}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{C0334F9A-1168-4101-9DD8-C30FB252D435}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{C0334F9A-1168-4101-9DD8-C30FB252D435}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2773,70 +3017,54 @@ Global
 		{C0334F9A-1168-4101-9DD8-C30FB252D435}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{C0334F9A-1168-4101-9DD8-C30FB252D435}.Release|Win32.ActiveCfg = Release|Win32
 		{C0334F9A-1168-4101-9DD8-C30FB252D435}.Release|Win32.Build.0 = Release|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Debug|Win32.Build.0 = Debug|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Win32.ActiveCfg = Release|Win32
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}.Release|Win32.Build.0 = Release|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Debug|Win32.Build.0 = Debug|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Win32.ActiveCfg = Release|Win32
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D}.Release|Win32.Build.0 = Release|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Debug|Win32.Build.0 = Debug|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Win32.ActiveCfg = Release|Win32
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}.Release|Win32.Build.0 = Release|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Debug|Win32.Build.0 = Debug|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Win32.ActiveCfg = Release|Win32
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Win32.Build.0 = Release|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Win32.Build.0 = Debug|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Win32.ActiveCfg = Release|Win32
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Release|Win32.Build.0 = Release|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Debug|Win32.Build.0 = Debug|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Win32.ActiveCfg = Release|Win32
-		{C70D3509-57C4-4326-90C1-2EC0AE34848D}.Release|Win32.Build.0 = Release|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Debug|Win32.Build.0 = Debug|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Win32.ActiveCfg = Release|Win32
-		{C8C6183C-B03C-11DD-B471-DFD256D89593}.Release|Win32.Build.0 = Release|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Debug|Win32.Build.0 = Debug|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Win32.ActiveCfg = Release|Win32
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7}.Release|Win32.Build.0 = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Win32.Build.0 = Debug|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Win32.ActiveCfg = Release|Win32
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Win32.Build.0 = Release|Win32
+		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Debug|Win32.Build.0 = Debug|Win32
+		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Release|Win32.ActiveCfg = Release|Win32
+		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Release|Win32.Build.0 = Release|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Win32.Build.0 = Debug|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Win32.ActiveCfg = Release|Win32
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Win32.Build.0 = Release|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Debug|Win32.Build.0 = Debug|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Win32.ActiveCfg = Release|Win32
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A}.Release|Win32.Build.0 = Release|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Debug|Win32.Build.0 = Debug|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Win32.ActiveCfg = Release|Win32
+		{4B60E8B8-416F-40B2-8A54-F75970A21992}.Release|Win32.Build.0 = Release|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Debug|Win32.Build.0 = Debug|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Win32.ActiveCfg = Release|Win32
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9}.Release|Win32.Build.0 = Release|Win32
 		{CAB69303-0F02-4C68-A12E-FFE55DB52526}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{CAB69303-0F02-4C68-A12E-FFE55DB52526}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{CAB69303-0F02-4C68-A12E-FFE55DB52526}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2845,94 +3073,14 @@ Global
 		{CAB69303-0F02-4C68-A12E-FFE55DB52526}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{CAB69303-0F02-4C68-A12E-FFE55DB52526}.Release|Win32.ActiveCfg = Release|Win32
 		{CAB69303-0F02-4C68-A12E-FFE55DB52526}.Release|Win32.Build.0 = Release|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Debug|Win32.Build.0 = Debug|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Win32.ActiveCfg = Release|Win32
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}.Release|Win32.Build.0 = Release|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Debug|Win32.Build.0 = Debug|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Win32.ActiveCfg = Release|Win32
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}.Release|Win32.Build.0 = Release|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Debug|Win32.Build.0 = Debug|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Win32.ActiveCfg = Release|Win32
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F}.Release|Win32.Build.0 = Release|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Debug|Win32.Build.0 = Debug|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Win32.ActiveCfg = Release|Win32
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B}.Release|Win32.Build.0 = Release|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Debug|Win32.Build.0 = Debug|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Win32.ActiveCfg = Release|Win32
-		{D314F1B3-9299-4866-8362-08BF811B0FA3}.Release|Win32.Build.0 = Release|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Debug|Win32.Build.0 = Debug|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Win32.ActiveCfg = Release|Win32
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C}.Release|Win32.Build.0 = Release|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Debug|Win32.Build.0 = Debug|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Win32.ActiveCfg = Release|Win32
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}.Release|Win32.Build.0 = Release|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Debug|Win32.Build.0 = Debug|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Win32.ActiveCfg = Release|Win32
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E}.Release|Win32.Build.0 = Release|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Debug|Win32.Build.0 = Debug|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Win32.ActiveCfg = Release|Win32
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}.Release|Win32.Build.0 = Release|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Debug|Win32.Build.0 = Debug|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Win32.ActiveCfg = Release|Win32
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}.Release|Win32.Build.0 = Release|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Debug|Win32.Build.0 = Debug|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Win32.ActiveCfg = Release|Win32
-		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}.Release|Win32.Build.0 = Release|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Debug|Win32.Build.0 = Debug|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Win32.ActiveCfg = Release|Win32
+		{A464166F-8507-49B4-9B02-5CB77C498B25}.Release|Win32.Build.0 = Release|Win32
 		{E07D267C-34C3-4DDB-8B41-94697808714A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{E07D267C-34C3-4DDB-8B41-94697808714A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{E07D267C-34C3-4DDB-8B41-94697808714A}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2941,328 +3089,181 @@ Global
 		{E07D267C-34C3-4DDB-8B41-94697808714A}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{E07D267C-34C3-4DDB-8B41-94697808714A}.Release|Win32.ActiveCfg = Release|Win32
 		{E07D267C-34C3-4DDB-8B41-94697808714A}.Release|Win32.Build.0 = Release|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Debug|Win32.Build.0 = Debug|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Win32.ActiveCfg = Release|Win32
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41}.Release|Win32.Build.0 = Release|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Debug|Win32.Build.0 = Debug|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Win32.ActiveCfg = Release|Win32
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC}.Release|Win32.Build.0 = Release|Win32
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Win32.ActiveCfg = Release|Win32
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5}.Release|Win32.Build.0 = Release|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Debug|Win32.Build.0 = Debug|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Win32.ActiveCfg = Release|Win32
-		{E3DF045F-2174-4685-9CF7-0630A79F324B}.Release|Win32.Build.0 = Release|Win32
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Win32.ActiveCfg = Release|Win32
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867}.Release|Win32.Build.0 = Release|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Debug|Win32.Build.0 = Debug|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Win32.ActiveCfg = Release|Win32
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055}.Release|Win32.Build.0 = Release|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Debug|Win32.Build.0 = Debug|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Win32.ActiveCfg = Release|Win32
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}.Release|Win32.Build.0 = Release|Win32
-		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E99DA267-BE90-4F45-88A1-6919DB2C7567}.Release|Win32.ActiveCfg = Release|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Debug|Win32.Build.0 = Debug|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Win32.ActiveCfg = Release|Win32
-		{EC8B7909-62AF-470D-A75D-E1D89C837142}.Release|Win32.Build.0 = Release|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Debug|Win32.Build.0 = Debug|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Win32.ActiveCfg = Release|Win32
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC}.Release|Win32.Build.0 = Release|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Debug|Win32.Build.0 = Debug|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Win32.ActiveCfg = Release|Win32
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C}.Release|Win32.Build.0 = Release|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Debug|Win32.Build.0 = Debug|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Win32.ActiveCfg = Release|Win32
-		{EFBB1436-A63F-4CD8-9E99-B89226E782EC}.Release|Win32.Build.0 = Release|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Debug|Win32.Build.0 = Debug|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Win32.ActiveCfg = Release|Win32
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51}.Release|Win32.Build.0 = Release|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Debug|Win32.Build.0 = Debug|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Win32.ActiveCfg = Release|Win32
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}.Release|Win32.Build.0 = Release|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Debug|Win32.Build.0 = Debug|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Win32.ActiveCfg = Release|Win32
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94}.Release|Win32.Build.0 = Release|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Debug|Win32.Build.0 = Debug|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Win32.ActiveCfg = Release|Win32
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Win32.Build.0 = Release|Win32
-		{FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Win32.ActiveCfg = Release|Win32
-		{FA39524D-3067-4141-888D-28A86C66F2B9}.Release|Win32.Build.0 = Release|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Debug|Win32.Build.0 = Debug|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Win32.ActiveCfg = Release|Win32
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22}.Release|Win32.Build.0 = Release|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Debug|Win32.Build.0 = Debug|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Win32.ActiveCfg = Release|Win32
-		{FA660037-EB40-4A43-AA9D-9653C57F2789}.Release|Win32.Build.0 = Release|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Debug|Win32.Build.0 = Debug|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Win32.ActiveCfg = Release|Win32
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}.Release|Win32.Build.0 = Release|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Debug|Win32.Build.0 = Debug|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Win32.ActiveCfg = Release|Win32
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}.Release|Win32.Build.0 = Release|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Win32.Build.0 = Debug|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Win32.ActiveCfg = Release|Win32
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Release|Win32.Build.0 = Release|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Debug|Win32.Build.0 = Debug|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Win32.ActiveCfg = Release|Win32
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{0026A376-C4F1-4575-A1BA-578C69F07013} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
-		{018D4F38-6272-448F-A864-976DA09F05D0} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{032541FB-1E7C-4423-B657-4A71FE180C8A} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{0E5474AC-5996-4B13-87C0-4AE931EE0815} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{1AFC1EC3-24FA-4260-B099-76319EC9977A} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
-		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{21C76E6E-8B38-44D6-8148-B589C13B9554} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
-		{21E22961-22BF-4493-BD3A-868F93DA5179} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
-		{226B3533-1FF3-42F6-A8E3-C4DDBC955290} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{228DD844-9926-420E-B193-6973BF2A4D0B} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {B6867423-23BD-4588-9321-2D500F128A3D}
+		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9} = {B6867423-23BD-4588-9321-2D500F128A3D}
+		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {B6867423-23BD-4588-9321-2D500F128A3D}
 		{2325D8C4-8EF5-42AC-8900-492225750DE4} = {B6867423-23BD-4588-9321-2D500F128A3D}
-		{238CE175-76CE-4A25-A676-69D115885601} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{24A5AC7C-280B-4899-9153-6BA570A081E7} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
-		{256DECCE-9886-4C21-96A5-EE47DF5E07E9} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{275F2993-EE9B-4E00-9C85-10A182FD423A} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {B6867423-23BD-4588-9321-2D500F128A3D}
+		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{D703D7A0-EDC1-4FE6-9E22-56154155B24E} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{50B079C7-CD01-42D3-B8C4-9F8D9322E822} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{FA39524D-3067-4141-888D-28A86C66F2B9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{B92AE829-E1CD-4781-824A-DCB1603A1672} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{8A3E1774-1DE9-445C-982D-3EE37C8A752A} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{E3749617-BA3D-4230-B54C-B758E56D9FA5} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{76235B67-1C27-4627-8A33-4B2E1EF93EDE} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{E6766F81-1FCD-4CD7-BC16-E36964A14867} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{E99DA267-BE90-4F45-88A1-6919DB2C7567} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{C8C6183C-B03C-11DD-B471-DFD256D89593} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
-		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
-		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
-		{2F914112-2657-49EC-8EA6-3BA63340DE27} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{300C6A09-663E-48B6-8E07-A0D50CAF8F25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {032541FB-1E7C-4423-B657-4A71FE180C8A}
-		{32167995-4014-4E4C-983B-F7E17C24EB25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{326E9795-E760-410A-B69A-3F79DB3F5243} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{34231B28-C51C-4C1C-AF07-C763668B1404} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{3A932C39-AFA9-4BDC-B775-F71A426D04BF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{3BD81303-4E14-4559-AA69-B30C3BAB08DD} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{3E6B24F6-9FA9-4066-859E-BF747FA3080A} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
+		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{018D4F38-6272-448F-A864-976DA09F05D0} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{903F8C1E-537A-4C9E-97BE-075147CBE769} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{414D4D24-5D65-498B-A33F-3A29AD3CDEDC} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{41735CD9-3E35-47F7-9FD1-4A9950B6B131} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{42ECD5EC-722F-41DE-B6B8-83764C8016DF} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{494E414B-1655-48CE-996D-6413ECFB7829} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
-		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
-		{4B60E8B8-416F-40B2-8A54-F75970A21992} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{D2250C20-3A94-4FB9-AF73-11BC5B73884B} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{4B6E199A-034A-49BD-AB93-458DD37E45B1} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {BC732CFC-DE0A-4CF5-B8AA-3269C2F6D399}
-		{50B079C7-CD01-42D3-B8C4-9F8D9322E822} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{A34770EA-A574-43E8-9327-F79C04770E98} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
+		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
+		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
+		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
 		{5597AD47-3494-4750-A235-4F9C2F864700} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
-		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{5916D37D-8C97-424F-A904-74E52594C2D6} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
-		{5AEA4BF6-27CD-47FC-9370-D87771CFA196} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{5BDB7EE1-A1FD-410C-9598-21519A1B7952} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{60B43839-95E6-4526-A661-209F16335E0E} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
 		{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
-		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{64D81334-DE73-457D-8FC1-9492508A2663} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{6AE76406-B03B-11DD-94B1-80B556D89593} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{60B43839-95E6-4526-A661-209F16335E0E} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
+		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
+		{494E414B-1655-48CE-996D-6413ECFB7829} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
+		{5916D37D-8C97-424F-A904-74E52594C2D6} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
+		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
 		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{6F9258E5-294F-47B2-919D-17FFE7A8B751} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{76235B67-1C27-4627-8A33-4B2E1EF93EDE} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{7B219FAA-E360-43C8-B341-804A94EEFFAC} = {B6867423-23BD-4588-9321-2D500F128A3D}
-		{7D456640-3619-4D23-A56D-E0084400CCBF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{7F0A70F6-BE3F-4C19-B435-956AB8F30BA4} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{80E37CB5-059D-4F4B-AEF6-08265468D368} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{1AFC1EC3-24FA-4260-B099-76319EC9977A} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{865575D0-37E2-405E-8CBA-5F6C485B5A26} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
+		{238CE175-76CE-4A25-A676-69D115885601} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{873D095E-150E-4262-8C41-2D8ED02F0F57} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{032541FB-1E7C-4423-B657-4A71FE180C8A} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{BC732CFC-DE0A-4CF5-B8AA-3269C2F6D399} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{881F6A97-D539-4C48-B401-DF04385B2343} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{8A3E1774-1DE9-445C-982D-3EE37C8A752A} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{326E9795-E760-410A-B69A-3F79DB3F5243} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{6AE76406-B03B-11DD-94B1-80B556D89593} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{0E5474AC-5996-4B13-87C0-4AE931EE0815} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{3BD81303-4E14-4559-AA69-B30C3BAB08DD} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{A0D94973-D355-47A5-A1E2-3456F321F010} = {1AFC1EC3-24FA-4260-B099-76319EC9977A}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {1AFC1EC3-24FA-4260-B099-76319EC9977A}
-		{903F8C1E-537A-4C9E-97BE-075147CBE769} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{9055E088-25C6-47FD-87D5-D9DD9FD75C9F} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {873D095E-150E-4262-8C41-2D8ED02F0F57}
 		{9946A048-043B-4F8F-9E07-9297B204714C} = {873D095E-150E-4262-8C41-2D8ED02F0F57}
-		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{9F53807E-9382-47BD-8371-E5D04F517E9C} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{A0D94973-D355-47A5-A1E2-3456F321F010} = {1AFC1EC3-24FA-4260-B099-76319EC9977A}
-		{A1CAA831-C507-4B2E-87F3-AEC63C9907F9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{A34770EA-A574-43E8-9327-F79C04770E98} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{A464166F-8507-49B4-9B02-5CB77C498B25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {032541FB-1E7C-4423-B657-4A71FE180C8A}
+		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {032541FB-1E7C-4423-B657-4A71FE180C8A}
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {BC732CFC-DE0A-4CF5-B8AA-3269C2F6D399}
+		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {BC732CFC-DE0A-4CF5-B8AA-3269C2F6D399}
+		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
+		{21E22961-22BF-4493-BD3A-868F93DA5179} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
+		{865575D0-37E2-405E-8CBA-5F6C485B5A26} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
+		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
+		{2DE20FFA-6F5E-48D9-84D8-09B044A5B119} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
+		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{41735CD9-3E35-47F7-9FD1-4A9950B6B131} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{4539AFB3-B8DC-47F3-A491-6DAC8FD26657} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{42ECD5EC-722F-41DE-B6B8-83764C8016DF} = {846901FD-A619-4BD5-A303-38174730CDD6}
+		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{A493331B-3180-49FE-8D0E-D121645E63AD} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{A5C5D801-4026-49F2-BBF1-250941855306} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{A5F831FD-9B9C-4FEF-9FBA-554817B734CE} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
-		{AAC78796-B9A2-4CD9-BF89-09B03E92BF73} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
+		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{D13F055D-4428-48F4-ABF6-18359C76EDB0} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{5BDB7EE1-A1FD-410C-9598-21519A1B7952} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{F7790A54-4078-4E4A-8231-818BE9FB1F94} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{D314F1B3-9299-4866-8362-08BF811B0FA3} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{34231B28-C51C-4C1C-AF07-C763668B1404} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{5AEA4BF6-27CD-47FC-9370-D87771CFA196} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{64D81334-DE73-457D-8FC1-9492508A2663} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{3A932C39-AFA9-4BDC-B775-F71A426D04BF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{228DD844-9926-420E-B193-6973BF2A4D0B} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{CE1426F6-7D2B-4574-9929-58387BF7B05F} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{AFF332BF-AF3D-4D35-86FC-42A727F01D36} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{E3DF045F-2174-4685-9CF7-0630A79F324B} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{275F2993-EE9B-4E00-9C85-10A182FD423A} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{B2D715CE-4CBB-415A-A032-E700C90ADF91} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{32167995-4014-4E4C-983B-F7E17C24EB25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{80E37CB5-059D-4F4B-AEF6-08265468D368} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{A5C5D801-4026-49F2-BBF1-250941855306} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {873D095E-150E-4262-8C41-2D8ED02F0F57}
-		{B84553C8-5676-427B-B3E4-23DDDC4DBC7B} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{B92AE829-E1CD-4781-824A-DCB1603A1672} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{BC732CFC-DE0A-4CF5-B8AA-3269C2F6D399} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
-		{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9} = {B6867423-23BD-4588-9321-2D500F128A3D}
-		{C0C7DA58-C90D-4BDE-AE44-588997339F5D} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
+		{9F53807E-9382-47BD-8371-E5D04F517E9C} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{2F914112-2657-49EC-8EA6-3BA63340DE27} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{C70D3509-57C4-4326-90C1-2EC0AE34848D} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{C8C6183C-B03C-11DD-B471-DFD256D89593} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{C9E0BD1D-B175-4A91-8380-3FDC81FAB9D7} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{CAB69303-0F02-4C68-A12E-FFE55DB52526} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{CE1426F6-7D2B-4574-9929-58387BF7B05F} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{D13F055D-4428-48F4-ABF6-18359C76EDB0} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{D2250C20-3A94-4FB9-AF73-11BC5B73884B} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{D314F1B3-9299-4866-8362-08BF811B0FA3} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{D703D7A0-EDC1-4FE6-9E22-56154155B24E} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {B6867423-23BD-4588-9321-2D500F128A3D}
+		{7D456640-3619-4D23-A56D-E0084400CCBF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{82F5BFE5-FDCE-47D4-8B38-BEEBED561681} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{300C6A09-663E-48B6-8E07-A0D50CAF8F25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{226B3533-1FF3-42F6-A8E3-C4DDBC955290} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{65C78BBB-8FCB-48E4-94C8-1F0F981929AF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{182D578D-2DAC-4BB7-AFEC-9A2855E56F94} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{C0C7DA58-C90D-4BDE-AE44-588997339F5D} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{FA660037-EB40-4A43-AA9D-9653C57F2789} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{3E6B24F6-9FA9-4066-859E-BF747FA3080A} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{4B60E8B8-416F-40B2-8A54-F75970A21992} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{256DECCE-9886-4C21-96A5-EE47DF5E07E9} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{CAB69303-0F02-4C68-A12E-FFE55DB52526} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{A464166F-8507-49B4-9B02-5CB77C498B25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{E07D267C-34C3-4DDB-8B41-94697808714A} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{E1D0B89E-257B-4BCA-A0C6-A2CD997A2FDC} = {846901FD-A619-4BD5-A303-38174730CDD6}
-		{E3749617-BA3D-4230-B54C-B758E56D9FA5} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{E3DF045F-2174-4685-9CF7-0630A79F324B} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{E6766F81-1FCD-4CD7-BC16-E36964A14867} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{E750512D-FC7C-4C98-BF04-0A0DAF882055} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{E7B11CF0-FE40-4A69-AE20-1B882F4D7585} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{E99DA267-BE90-4F45-88A1-6919DB2C7567} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{EC8B7909-62AF-470D-A75D-E1D89C837142} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
-		{ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
+		{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{9D13D9B8-6C28-42A7-935C-B769EBC55BAA} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+		{21C76E6E-8B38-44D6-8148-B589C13B9554} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
 		{EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
-		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
-		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
-		{F7790A54-4078-4E4A-8231-818BE9FB1F94} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {032541FB-1E7C-4423-B657-4A71FE180C8A}
-		{FA39524D-3067-4141-888D-28A86C66F2B9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
-		{FA660037-EB40-4A43-AA9D-9653C57F2789} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {BC732CFC-DE0A-4CF5-B8AA-3269C2F6D399}
-		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {B6867423-23BD-4588-9321-2D500F128A3D}
+		{24A5AC7C-280B-4899-9153-6BA570A081E7} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
+		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
+		{0026A376-C4F1-4575-A1BA-578C69F07013} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
 	EndGlobalSection
 EndGlobal
diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index 7e0d5ca..bb7fa95 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -131,6 +131,9 @@ if env['PLATFORM'] == 'posix':
     '$PORT_DIR/platform/chromium/ScrollbarThemeChromiumLinux.cpp',
     '$PORT_DIR/platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp',
     '$PORT_DIR/platform/graphics/skia/GdkSkia.cc',
+
+    '$PORT_DIR/platform/graphics/skia/public/PlatformCanvasLinux.cpp',
+    '$PORT_DIR/platform/graphics/skia/public/PlatformDeviceLinux.cpp',
   ])
 
 if env['PLATFORM'] == 'darwin':
@@ -145,6 +148,9 @@ if env['PLATFORM'] == 'darwin':
     '$PORT_DIR/platform/chromium/ScrollbarThemeChromium.cpp',
     '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp',
     '$PORT_DIR/platform/graphics/ImageSkia.cpp',
+
+    '$PORT_DIR/platform/graphics/skia/public/PlatformCanvasMac.cpp',
+    '$PORT_DIR/platform/graphics/skia/public/PlatformDeviceMac.cpp',
   ]
   for remove in remove_files:
     input_files.remove(remove)
@@ -166,6 +172,12 @@ if env['PLATFORM'] == 'win32':
     '$PORT_DIR/platform/graphics/ThemeHelperWin.cpp',
     '$PORT_DIR/platform/graphics/UniscribeHelper.cpp',
     '$PORT_DIR/platform/graphics/UniscribeHelperTextRun.cpp',
+
+    '$PORT_DIR/platform/graphics/skia/public/PlatformCanvasWin.cpp',
+    '$PORT_DIR/platform/graphics/skia/public/PlatformDeviceWin.cpp',
+    '$PORT_DIR/platform/graphics/skia/public/VectorCanvas.cpp',
+    '$PORT_DIR/platform/graphics/skia/public/VectorDevice.cpp',
+
     '$PORT_DIR/rendering/RenderThemeWin.cpp',
   ])
 
diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj
index d521dda..579d049 100644
--- a/webkit/build/port/port.vcproj
+++ b/webkit/build/port/port.vcproj
@@ -1066,6 +1066,66 @@
 						>
 					</File>
 				</Filter>
+				<Filter
+					Name="skia"
+					>
+					<Filter
+						Name="public"
+						>
+						<File
+							RelativePath="..\..\port\platform\graphics\skia\public\BitmapPlatformDevice.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\port\platform\graphics\skia\public\BitmapPlatformDeviceWin.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\port\platform\graphics\skia\public\BitmapPlatformDeviceWin.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\port\platform\graphics\skia\public\PlatformCanvas.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\port\platform\graphics\skia\public\PlatformCanvasWin.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\port\platform\graphics\skia\public\PlatformCanvasWin.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\port\platform\graphics\skia\public\PlatformDevice.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\port\platform\graphics\skia\public\PlatformDeviceWin.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\port\platform\graphics\skia\public\PlatformDeviceWin.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\port\platform\graphics\skia\public\VectorCanvas.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\port\platform\graphics\skia\public\VectorCanvas.h"
+							>
+						</File>
+						<File
+							RelativePath="..\..\port\platform\graphics\skia\public\VectorDevice.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\..\port\platform\graphics\skia\public\VectorDevice.h"
+							>
+						</File>
+					</Filter>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="image-decoders"
diff --git a/webkit/port/platform/graphics/skia/public/BitmapPlatformDevice.h b/webkit/port/platform/graphics/skia/public/BitmapPlatformDevice.h
new file mode 100644
index 0000000..6fd9e88
--- /dev/null
+++ b/webkit/port/platform/graphics/skia/public/BitmapPlatformDevice.h
@@ -0,0 +1,30 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Declare a platform-neutral name for this platform's bitmap device class
+// that can be used by upper-level classes that just need to pass a reference
+// around.
+
+#if defined(WIN32)
+#include "BitmapPlatformDeviceWin.h"
+namespace gfx {
+
+typedef BitmapPlatformDeviceWin BitmapPlatformDevice;
+
+}  // namespace gfx
+#elif defined(__APPLE__)
+#include "BitmapPlatformDeviceMac.h"
+namespace gfx {
+
+typedef BitmapPlatformDeviceMac BitmapPlatformDevice;
+
+}  // namespace gfx
+#elif defined(__linux__)
+#include "BitmapPlatformDeviceLinux.h"
+namespace gfx {
+
+typedef BitmapPlatformDeviceLinux BitmapPlatformDevice;
+
+}  // namespace gfx
+#endif
+\ No newline at end of file
diff --git a/base/gfx/bitmap_platform_device_linux.cc b/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceLinux.cpp
index 18f8ab1..c80a273 100644
--- a/base/gfx/bitmap_platform_device_linux.cc
+++ b/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceLinux.cpp
@@ -10,31 +10,6 @@
 
 namespace gfx {
 
-// -----------------------------------------------------------------------------
-// These objects are reference counted and own a Cairo surface. The surface is
-// the backing store for a Skia bitmap and we reference count it so that we can
-// copy BitmapPlatformDeviceLinux objects without having to copy all the image
-// data.
-// -----------------------------------------------------------------------------
-class BitmapPlatformDeviceLinux::BitmapPlatformDeviceLinuxData
-    : public base::RefCounted<BitmapPlatformDeviceLinuxData> {
- public:
-  explicit BitmapPlatformDeviceLinuxData(cairo_surface_t* surface)
-      : surface_(surface) { }
-
-  cairo_surface_t* surface() const { return surface_; }
-
- protected:
-  cairo_surface_t *const surface_;
-
-  friend class base::RefCounted<BitmapPlatformDeviceLinuxData>;
-  ~BitmapPlatformDeviceLinuxData() {
-    cairo_surface_destroy(surface_);
-  }
-
-  DISALLOW_EVIL_CONSTRUCTORS(BitmapPlatformDeviceLinuxData);
-};
-
 // We use this static factory function instead of the regular constructor so
 // that we can create the pixel data before calling the constructor. This is
 // required so that we can call the base class' constructor with the pixel
@@ -58,37 +33,28 @@ BitmapPlatformDeviceLinux* BitmapPlatformDeviceLinux::Create(
 #endif
 
   // The device object will take ownership of the graphics context.
-  return new BitmapPlatformDeviceLinux
-      (bitmap, new BitmapPlatformDeviceLinuxData(surface));
+  return new BitmapPlatformDeviceLinux(bitmap, surface);
 }
 
 // The device will own the bitmap, which corresponds to also owning the pixel
 // data. Therefore, we do not transfer ownership to the SkDevice's bitmap.
-BitmapPlatformDeviceLinux::BitmapPlatformDeviceLinux(
-    const SkBitmap& bitmap,
-    BitmapPlatformDeviceLinuxData* data)
+BitmapPlatformDeviceLinux::BitmapPlatformDeviceLinux(const SkBitmap& bitmap,
+                                                     cairo_surface_t* surface)
     : PlatformDeviceLinux(bitmap),
-      data_(data) {
+      surface_(surface) {
 }
 
 BitmapPlatformDeviceLinux::BitmapPlatformDeviceLinux(
     const BitmapPlatformDeviceLinux& other)
     : PlatformDeviceLinux(const_cast<BitmapPlatformDeviceLinux&>(
-                          other).accessBitmap(true)),
-      data_(other.data_) {
+                          other).accessBitmap(true)) {
 }
 
 BitmapPlatformDeviceLinux::~BitmapPlatformDeviceLinux() {
-}
-
-cairo_surface_t* BitmapPlatformDeviceLinux::surface() const {
-  return data_->surface();
-}
-
-BitmapPlatformDeviceLinux& BitmapPlatformDeviceLinux::operator=(
-    const BitmapPlatformDeviceLinux& other) {
-  data_ = other.data_;
-  return *this;
+  if (surface_) {
+    cairo_surface_destroy(surface_);
+    surface_ = NULL;
+  }
 }
 
 }  // namespace gfx
diff --git a/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceLinux.h b/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceLinux.h
new file mode 100644
index 0000000..840df24
--- /dev/null
+++ b/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceLinux.h
@@ -0,0 +1,91 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef BitmapPlatformDeviceLinux_h
+#define BitmapPlatformDeviceLinux_h
+
+#include "PLatformDeviceLinux.h"
+#include "base/ref_counted.h"
+
+typedef struct _cairo_surface cairo_surface_t;
+
+// -----------------------------------------------------------------------------
+// Image byte ordering on Linux:
+//
+// Pixels are packed into 32-bit words these days. Even for 24-bit images,
+// often 8-bits will be left unused for alignment reasons. Thus, when you see
+// ARGB as the byte order you have to wonder if that's in memory order or
+// little-endian order. Here I'll write A.R.G.B to specifiy the memory order.
+//
+// GdkPixbuf's provide a nice backing store and defaults to R.G.B.A order.
+// They'll do the needed byte swapping to match the X server when drawn.
+//
+// Skia can be controled in skia/include/corecg/SkUserConfig.h (see bits about
+// SK_R32_SHIFT). For Linux we define it to be ARGB in registers. For little
+// endian machines that means B.G.R.A in memory.
+//
+// The image loaders are controlled in
+// webkit/port/platform/image-decoders/ImageDecoder.h (see setRGBA). These are
+// also configured for ARGB in registers.
+//
+// Cairo's only 32-bit mode is ARGB in registers.
+//
+// X servers commonly have a 32-bit visual with xRGB in registers (since they
+// typically don't do alpha blending of drawables at the user level. Composite
+// extensions aside.)
+//
+// We don't use GdkPixbuf because its byte order differs from the rest. Most
+// importantly, it differs from Cairo which, being a system library, is
+// something that we can't easily change.
+// -----------------------------------------------------------------------------
+
+namespace gfx {
+
+// -----------------------------------------------------------------------------
+// This is the Linux bitmap backing for Skia. We create a Cairo image surface
+// to store the backing buffer. This buffer is BGRA in memory (on little-endian
+// machines).
+//
+// For now we are also using Cairo to paint to the Drawables so we provide an
+// accessor for getting the surface.
+//
+// This is all quite ok for test_shell. In the future we will want to use
+// shared memory between the renderer and the main process at least. In this
+// case we'll probably create the buffer from a precreated region of memory.
+// -----------------------------------------------------------------------------
+class BitmapPlatformDeviceLinux : public PlatformDeviceLinux {
+  // A reference counted cairo surface
+  class BitmapPlatformDeviceLinuxData;
+
+ public:
+  /// Static constructor. I don't understand this, it's just a copy of the mac
+  static BitmapPlatformDeviceLinux* Create(int width, int height,
+                                           bool is_opaque);
+
+  // Create a BitmapPlatformDeviceLinux from an already constructed bitmap;
+  // you should probably be using Create(). This may become private later if
+  // we ever have to share state between some native drawing UI and Skia, like
+  // the Windows and Mac versions of this class do.
+  //
+  // This object takes ownership of @data.
+  BitmapPlatformDeviceLinux(const SkBitmap& other,
+                            BitmapPlatformDeviceLinuxData* data);
+  virtual ~BitmapPlatformDeviceLinux();
+  BitmapPlatformDeviceLinux& operator=(const BitmapPlatformDeviceLinux& other);
+
+  // A stub copy constructor.  Needs to be properly implemented.
+  BitmapPlatformDeviceLinux(const BitmapPlatformDeviceLinux& other);
+
+  // Bitmaps aren't vector graphics.
+  virtual bool IsVectorial() { return false; }
+
+  cairo_surface_t* surface() const;
+
+ private:
+  scoped_refptr<BitmapPlatformDeviceLinuxData> data_;
+};
+
+}  // namespace gfx
+
+#endif  // BitmapPlatformDeviceLinux_h
diff --git a/base/gfx/bitmap_platform_device_mac.cc b/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceMac.cpp
index 570b07e..570b07e 100755
--- a/base/gfx/bitmap_platform_device_mac.cc
+++ b/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceMac.cpp
diff --git a/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceMac.h b/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceMac.h
new file mode 100755
index 0000000..04383d7
--- /dev/null
+++ b/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceMac.h
@@ -0,0 +1,95 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef BitmapPlatformDeviceMac_h
+#define BitmapPlatformDeviceMac_h
+
+#include "base/gfx/platform_device_mac.h"
+#include "base/ref_counted.h"
+
+namespace gfx {
+
+// A device is basically a wrapper around SkBitmap that provides a surface for
+// SkCanvas to draw into. Our device provides a surface CoreGraphics can also
+// write to. BitmapPlatformDeviceMac creates a bitmap using
+// CGCreateBitmapContext() in a format that Skia supports and can then use this
+// to draw text into, etc. This pixel data is provided to the bitmap that the
+// device contains so that it can be shared.
+//
+// The device owns the pixel data, when the device goes away, the pixel data
+// also becomes invalid. THIS IS DIFFERENT THAN NORMAL SKIA which uses
+// reference counting for the pixel data. In normal Skia, you could assign
+// another bitmap to this device's bitmap and everything will work properly.
+// For us, that other bitmap will become invalid as soon as the device becomes
+// invalid, which may lead to subtle bugs. Therefore, DO NOT ASSIGN THE
+// DEVICE'S PIXEL DATA TO ANOTHER BITMAP, make sure you copy instead.
+class BitmapPlatformDeviceMac : public PlatformDeviceMac {
+ public:
+  // Factory function. The screen DC is used to create the bitmap, and will not
+  // be stored beyond this function. is_opaque should be set if the caller
+  // knows the bitmap will be completely opaque and allows some optimizations.
+  //
+  // The shared_section parameter is optional (pass NULL for default behavior).
+  // If shared_section is non-null, then it must be a handle to a file-mapping
+  // object returned by CreateFileMapping.  See CreateDIBSection for details.
+  static BitmapPlatformDeviceMac* Create(CGContextRef context,
+                                         int width,
+                                         int height,
+                                         bool is_opaque);
+
+  // Copy constructor. When copied, devices duplicate their internal data, so
+  // stay linked. This is because their implementation is very heavyweight
+  // (lots of memory and CoreGraphics state). If a device has been copied, both
+  // clip rects and other state will stay in sync.
+  //
+  // This means it will NOT work to duplicate a device and assign it to a
+  // canvas, because the two canvases will each set their own clip rects, and
+  // the resulting CoreGraphics drawing state will be unpredictable.
+  //
+  // Copy constucting and "=" is designed for saving the device or passing it
+  // around to another routine willing to deal with the bitmap data directly.
+  BitmapPlatformDeviceMac(const BitmapPlatformDeviceMac& other);
+  virtual ~BitmapPlatformDeviceMac();
+
+  // See warning for copy constructor above.
+  BitmapPlatformDeviceMac& operator=(const BitmapPlatformDeviceMac& other);
+
+  virtual CGContextRef GetBitmapContext();
+  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
+
+  virtual void DrawToContext(CGContextRef context, int x, int y,
+                             const CGRect* src_rect);
+  virtual bool IsVectorial() { return false; }
+  virtual void fixupAlphaBeforeCompositing() { };
+  
+  // Returns the color value at the specified location. This does not
+  // consider any transforms that may be set on the device.
+  SkColor getColorAt(int x, int y);
+
+ protected:
+  // Reference counted data that can be shared between multiple devices. This
+  // allows copy constructors and operator= for devices to work properly. The
+  // bitmaps used by the base device class are already refcounted and copyable.
+  class BitmapPlatformDeviceMacData;
+
+  BitmapPlatformDeviceMac(BitmapPlatformDeviceMacData* data,
+                          const SkBitmap& bitmap);
+
+  // Flushes the CoreGraphics context so that the pixel data can be accessed
+  // directly by Skia. Overridden from SkDevice, this is called when Skia
+  // starts accessing pixel data.
+  virtual void onAccessBitmap(SkBitmap*);
+
+  // Data associated with this device, guaranteed non-null.
+  scoped_refptr<BitmapPlatformDeviceMacData> data_;
+
+  virtual void processPixels(int x, int y,
+                             int width, int height, 
+                             adjustAlpha adjustor);
+};
+
+}  // namespace gfx
+
+#endif  // BitmapPlatformDeviceMac_h
+
diff --git a/base/gfx/bitmap_platform_device_win.cc b/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceWin.cpp
index 85597ae..ceed2c8 100644
--- a/base/gfx/bitmap_platform_device_win.cc
+++ b/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceWin.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/bitmap_platform_device_win.h"
+#include "BitmapPlatformDeviceWin.h"
 
 #include "base/gfx/gdi_util.h"
 #include "base/logging.h"
diff --git a/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceWin.h b/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceWin.h
new file mode 100644
index 0000000..24008d4
--- /dev/null
+++ b/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceWin.h
@@ -0,0 +1,111 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef BitmapPlatformDeviceWin_h
+#define BitmapPlatformDeviceWin_h
+
+#include "base/gfx/platform_device_win.h"
+#include "base/ref_counted.h"
+
+namespace gfx {
+
+// A device is basically a wrapper around SkBitmap that provides a surface for
+// SkCanvas to draw into. Our device provides a surface Windows can also write
+// to. BitmapPlatformDeviceWin creates a bitmap using CreateDIBSection() in a
+// format that Skia supports and can then use this to draw ClearType into, etc.
+// This pixel data is provided to the bitmap that the device contains so that it
+// can be shared.
+//
+// The device owns the pixel data, when the device goes away, the pixel data
+// also becomes invalid. THIS IS DIFFERENT THAN NORMAL SKIA which uses
+// reference counting for the pixel data. In normal Skia, you could assign
+// another bitmap to this device's bitmap and everything will work properly.
+// For us, that other bitmap will become invalid as soon as the device becomes
+// invalid, which may lead to subtle bugs. Therefore, DO NOT ASSIGN THE
+// DEVICE'S PIXEL DATA TO ANOTHER BITMAP, make sure you copy instead.
+class BitmapPlatformDeviceWin : public PlatformDeviceWin {
+ public:
+  // Factory function. The screen DC is used to create the bitmap, and will not
+  // be stored beyond this function. is_opaque should be set if the caller
+  // knows the bitmap will be completely opaque and allows some optimizations.
+  //
+  // The shared_section parameter is optional (pass NULL for default behavior).
+  // If shared_section is non-null, then it must be a handle to a file-mapping
+  // object returned by CreateFileMapping.  See CreateDIBSection for details.
+  static BitmapPlatformDeviceWin* create(HDC screen_dc,
+                                int width,
+                                int height,
+                                bool is_opaque,
+                                HANDLE shared_section);
+
+  // Copy constructor. When copied, devices duplicate their internal data, so
+  // stay linked. This is because their implementation is very heavyweight
+  // (lots of memory and some GDI objects). If a device has been copied, both
+  // clip rects and other state will stay in sync.
+  //
+  // This means it will NOT work to duplicate a device and assign it to a
+  // canvas, because the two canvases will each set their own clip rects, and
+  // the resulting GDI clip rect will be random.
+  //
+  // Copy constucting and "=" is designed for saving the device or passing it
+  // around to another routine willing to deal with the bitmap data directly.
+  BitmapPlatformDeviceWin(const BitmapPlatformDeviceWin& other);
+  virtual ~BitmapPlatformDeviceWin();
+
+  // See warning for copy constructor above.
+  BitmapPlatformDeviceWin& operator=(const BitmapPlatformDeviceWin& other);
+
+  // Retrieves the bitmap DC, which is the memory DC for our bitmap data. The
+  // bitmap DC is lazy created.
+  virtual HDC getBitmapDC();
+  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
+
+  virtual void drawToHDC(HDC dc, int x, int y, const RECT* src_rect);
+  virtual void prepareForGDI(int x, int y, int width, int height);
+  virtual void postProcessGDI(int x, int y, int width, int height);
+  virtual void makeOpaque(int x, int y, int width, int height);
+  virtual void fixupAlphaBeforeCompositing();
+  virtual bool IsVectorial() { return false; }
+
+  // Returns the color value at the specified location. This does not
+  // consider any transforms that may be set on the device.
+  SkColor getColorAt(int x, int y);
+
+ protected:
+  // Flushes the Windows device context so that the pixel data can be accessed
+  // directly by Skia. Overridden from SkDevice, this is called when Skia
+  // starts accessing pixel data.
+  virtual void onAccessBitmap(SkBitmap* bitmap);
+
+ private:
+  // Function pointer used by the processPixels method for setting the alpha
+  // value of a particular pixel.
+  typedef void (*adjustAlpha)(uint32_t* pixel);
+
+  // Reference counted data that can be shared between multiple devices. This
+  // allows copy constructors and operator= for devices to work properly. The
+  // bitmaps used by the base device class are already refcounted and copyable.
+  class BitmapPlatformDeviceWinData;
+
+  // Private constructor.
+  BitmapPlatformDeviceWin(BitmapPlatformDeviceWinData* data,
+                          const SkBitmap& bitmap);
+
+  // Loops through each of the pixels in the specified range, invoking
+  // adjustor for the alpha value of each pixel. If |width| or |height| are -1,
+  // the available width/height is used.
+  template<adjustAlpha adjustor>
+  void processPixels(int x,
+                     int y,
+                     int width,
+                     int height);
+
+  // Data associated with this device, guaranteed non-null.
+  scoped_refptr<BitmapPlatformDeviceWinData> data_;
+};
+
+}  // namespace gfx
+
+#endif  // BASE_GFX_BITMAP_PLATFORM_DEVICE_WIN_H_
+
diff --git a/webkit/port/platform/graphics/skia/public/PlatformCanvas.h b/webkit/port/platform/graphics/skia/public/PlatformCanvas.h
new file mode 100644
index 0000000..9fdfd68
--- /dev/null
+++ b/webkit/port/platform/graphics/skia/public/PlatformCanvas.h
@@ -0,0 +1,30 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Declare a platform-neutral name for this platform's canvas class
+// that can be used by upper-level classes that just need to pass a reference
+// around.
+
+#if defined(WIN32)
+#include "PlatformCanvasWin.h"
+namespace gfx {
+
+typedef PlatformCanvasWin PlatformCanvas;
+
+}  // namespace gfx
+#elif defined(__APPLE__)
+#include "PlatformCanvasMac.h"
+namespace gfx {
+
+typedef PlatformCanvasMac PlatformCanvas;
+
+}  // namespace gfx
+#elif defined(__linux__)
+#include "PlatformCanvasLinux.h"
+namespace gfx {
+
+typedef PlatformCanvasLinux PlatformCanvas;
+
+}  // namespace gfx
+#endif
diff --git a/base/gfx/platform_canvas_linux.cc b/webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.cpp
index b579536..5ebeb27 100644
--- a/base/gfx/platform_canvas_linux.cc
+++ b/webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.cpp
@@ -38,11 +38,8 @@ PlatformDeviceLinux& PlatformCanvasLinux::getTopPlatformDevice() const {
   return *static_cast<PlatformDeviceLinux*>(iter.device());
 }
 
-SkDevice* PlatformCanvasLinux::createDevice(SkBitmap::Config config,
-                                            int width,
-                                            int height,
-                                            bool is_opaque, bool isForLayer) {
-  DCHECK(config == SkBitmap::kARGB_8888_Config);
+SkDevice* PlatformCanvasLinux::createDevice(SkBitmap::Config, int width,
+                                            int height, bool is_opaque) {
   return createPlatformDevice(width, height, is_opaque);
 }
 
diff --git a/webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.h b/webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.h
new file mode 100644
index 0000000..d6f5d2b
--- /dev/null
+++ b/webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.h
@@ -0,0 +1,52 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef PlatformCanvasLinux_h
+#define PlatformCanvasLinux_h
+
+#include "PlatformCanvasLinux.h"
+
+namespace gfx {
+
+// This class is a specialization of the regular SkCanvas that is designed to
+// work with a gfx::PlatformDevice to manage platform-specific drawing. It
+// allows using both Skia operations and platform-specific operations.
+class PlatformCanvasLinux : public SkCanvas {
+ public:
+  // Set is_opaque if you are going to erase the bitmap and not use
+  // tranparency: this will enable some optimizations.  The shared_section
+  // parameter is passed to gfx::PlatformDevice::create.  See it for details.
+  //
+  // If you use the version with no arguments, you MUST call initialize()
+  PlatformCanvasLinux();
+  PlatformCanvasLinux(int width, int height, bool is_opaque);
+  virtual ~PlatformCanvasLinux();
+
+  // For two-part init, call if you use the no-argument constructor above
+  bool initialize(int width, int height, bool is_opaque);
+
+  // Returns the platform device pointer of the topmost rect with a non-empty
+  // clip. Both the windows and mac versions have an equivalent of this method;
+  // a Linux version is added for compatibility.
+  PlatformDeviceLinux& getTopPlatformDevice() const;
+
+ protected:
+  // Creates a device store for use by the canvas. We override this so that
+  // the device is always our own so we know that we can use GDI operations
+  // on it. Simply calls into createPlatformDevice().
+  virtual SkDevice* createDevice(SkBitmap::Config, int width, int height,
+                                 bool is_opaque);
+
+  // Creates a device store for use by the canvas. By default, it creates a
+  // BitmapPlatformDevice object. Can be overridden to change the object type.
+  virtual SkDevice* createPlatformDevice(int width, int height, bool is_opaque);
+
+  // Disallow copy and assign.
+  PlatformCanvasLinux(const PlatformCanvasLinux&);
+  PlatformCanvasLinux& operator=(const PlatformCanvasLinux&);
+};
+
+}  // namespace gfx
+
+#endif  // PlatformCanvasLinux_h
diff --git a/base/gfx/platform_canvas_mac.cc b/webkit/port/platform/graphics/skia/public/PlatformCanvasMac.cpp
index 2777dee..e78ade7 100755
--- a/base/gfx/platform_canvas_mac.cc
+++ b/webkit/port/platform/graphics/skia/public/PlatformCanvasMac.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/platform_canvas_mac.h"
+#include "PlatformCanvasMac.h"
 
 #include "base/gfx/bitmap_platform_device_mac.h"
 #include "base/logging.h"
diff --git a/webkit/port/platform/graphics/skia/public/PlatformCanvasMac.h b/webkit/port/platform/graphics/skia/public/PlatformCanvasMac.h
new file mode 100755
index 0000000..8a39637
--- /dev/null
+++ b/webkit/port/platform/graphics/skia/public/PlatformCanvasMac.h
@@ -0,0 +1,88 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef PlatformCanvasMac_h
+#define PlatformCanvasMac_h
+
+#include "PlatformDeviceMac.h"
+
+#include "SkCanvas.h"
+
+namespace gfx {
+
+// This class is a specialization of the regular SkCanvas that is designed to
+// work with a gfx::PlatformDevice to manage platform-specific drawing. It
+// allows using both Skia operations and platform-specific operations.
+class PlatformCanvasMac : public SkCanvas {
+ public:
+  // Set is_opaque if you are going to erase the bitmap and not use
+  // tranparency: this will enable some optimizations.  The shared_section
+  // parameter is passed to gfx::PlatformDevice::create.  See it for details.
+  //
+  // If you use the version with no arguments, you MUST call initialize()
+  PlatformCanvasMac();
+  PlatformCanvasMac(int width, int height, bool is_opaque);
+  PlatformCanvasMac(int width, int height, bool is_opaque, CGContextRef context);
+  virtual ~PlatformCanvasMac();
+
+  // For two-part init, call if you use the no-argument constructor above
+  bool initialize(int width, int height, bool is_opaque);
+
+  // These calls should surround calls to platform drawing routines. The CG
+  // context returned by beginPlatformPaint is the one that can be used to
+  // draw into.
+  // Call endPlatformPaint when you are done and want to use Skia operations
+  // again; this will synchronize the bitmap.
+  virtual CGContextRef beginPlatformPaint();
+  virtual void endPlatformPaint();
+
+  // Returns the platform device pointer of the topmost rect with a non-empty
+  // clip. In practice, this is usually either the top layer or nothing, since
+  // we usually set the clip to new layers when we make them.
+  //
+  // If there is no layer that is not all clipped out, this will return a
+  // dummy device so callers do not have to check. If you are concerned about
+  // performance, check the clip before doing any painting.
+  //
+  // This is different than SkCanvas' getDevice, because that returns the
+  // bottommost device.
+  //
+  // Danger: the resulting device should not be saved. It will be invalidated
+  // by the next call to save() or restore().
+  PlatformDeviceMac& getTopPlatformDevice() const;
+
+  // Allow callers to see the non-virtual function even though we have an
+  // override of a virtual one.
+  using SkCanvas::clipRect;
+
+ protected:
+  // Creates a device store for use by the canvas. We override this so that
+  // the device is always our own so we know that we can use GDI operations
+  // on it. Simply calls into createPlatformDevice().
+  virtual SkDevice* createDevice(SkBitmap::Config, int width, int height,
+                                 bool is_opaque, bool isForLayer);
+
+  // Creates a device store for use by the canvas. By default, it creates a
+  // BitmapPlatformDevice object. Can be overridden to change the object type.
+  virtual SkDevice* createPlatformDevice(int width, int height, bool is_opaque,
+                                         CGContextRef context);
+
+ private:
+  // Unimplemented. This is to try to prevent people from calling this function
+  // on SkCanvas. SkCanvas' version is not virtual, so we can't prevent this
+  // 100%, but hopefully this will make people notice and not use the function.
+  // Calling SkCanvas' version will create a new device which is not compatible
+  // with us and we will crash if somebody tries to draw into it with
+  // CoreGraphics.
+  SkDevice* setBitmapDevice(const SkBitmap& bitmap);
+
+  // Disallow copy and assign.
+  PlatformCanvasMac(const PlatformCanvasMac&);
+  PlatformCanvasMac& operator=(const PlatformCanvasMac&);
+};
+
+}  // namespace gfx
+
+#endif  // PlatformCanvasMac_h
+
diff --git a/base/gfx/platform_canvas_win.cc b/webkit/port/platform/graphics/skia/public/PlatformCanvasWin.cpp
index fe90c55..6c0fe08 100644
--- a/base/gfx/platform_canvas_win.cc
+++ b/webkit/port/platform/graphics/skia/public/PlatformCanvasWin.cpp
@@ -2,17 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/platform_canvas_win.h"
+#include "PlatformCanvasWin.h"
+
+#include "BitmapPlatformDeviceWin.h"
 
-#include "base/gfx/bitmap_platform_device_win.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 
-#ifdef ARCH_CPU_64_BITS
-#error This code does not work on x64. Please make sure all the base unit tests\
- pass before doing any real work.
-#endif
-
 namespace gfx {
 
 // Crashes the process. This is called when a bitmap allocation fails, and this
@@ -49,17 +45,17 @@ PlatformCanvasWin::PlatformCanvasWin() : SkCanvas() {
 PlatformCanvasWin::PlatformCanvasWin(int width, int height, bool is_opaque)
     : SkCanvas() {
   bool initialized = initialize(width, height, is_opaque, NULL);
-  if (!initialized) 
+  if (!initialized)
     CrashForBitmapAllocationFailure(width, height);
 }
 
 PlatformCanvasWin::PlatformCanvasWin(int width,
-                               int height,
-                               bool is_opaque,
-                               HANDLE shared_section)
+                                     int height,
+                                     bool is_opaque,
+                                     HANDLE shared_section)
     : SkCanvas() {
   bool initialized = initialize(width, height, is_opaque, shared_section);
-  if (!initialized) 
+  if (!initialized)
     CrashForBitmapAllocationFailure(width, height);
 }
 
@@ -96,17 +92,17 @@ PlatformDeviceWin& PlatformCanvasWin::getTopPlatformDevice() const {
 }
 
 SkDevice* PlatformCanvasWin::createDevice(SkBitmap::Config config,
-                                       int width,
-                                       int height,
-                                       bool is_opaque, bool isForLayer) {
+                                          int width,
+                                          int height,
+                                          bool is_opaque, bool isForLayer) {
   DCHECK(config == SkBitmap::kARGB_8888_Config);
   return createPlatformDevice(width, height, is_opaque, NULL);
 }
 
 SkDevice* PlatformCanvasWin::createPlatformDevice(int width,
-                                               int height,
-                                               bool is_opaque,
-                                               HANDLE shared_section) {
+                                                  int height,
+                                                  bool is_opaque,
+                                                  HANDLE shared_section) {
   HDC screen_dc = GetDC(NULL);
   SkDevice* device = BitmapPlatformDeviceWin::create(screen_dc, width, height,
                                                   is_opaque, shared_section);
diff --git a/webkit/port/platform/graphics/skia/public/PlatformCanvasWin.h b/webkit/port/platform/graphics/skia/public/PlatformCanvasWin.h
new file mode 100644
index 0000000..fa84693
--- /dev/null
+++ b/webkit/port/platform/graphics/skia/public/PlatformCanvasWin.h
@@ -0,0 +1,202 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef PlatformCanvasWin_h
+#define PlatformCanvasWin_h
+
+#include <windows.h>
+
+#include "PlatformDeviceWin.h"
+#include "base/basictypes.h"
+
+#include "SkCanvas.h"
+
+namespace gfx {
+
+// This class is a specialization of the regular SkCanvas that is designed to
+// work with a gfx::PlatformDevice to manage platform-specific drawing. It
+// allows using both Skia operations and platform-specific operations.
+class PlatformCanvasWin : public SkCanvas {
+ public:
+  // Set is_opaque if you are going to erase the bitmap and not use
+  // transparency: this will enable some optimizations.  The shared_section
+  // parameter is passed to gfx::PlatformDevice::create.  See it for details.
+  //
+  // If you use the version with no arguments, you MUST call initialize()
+  PlatformCanvasWin();
+  PlatformCanvasWin(int width, int height, bool is_opaque);
+  PlatformCanvasWin(int width, int height, bool is_opaque,
+                    HANDLE shared_section);
+  virtual ~PlatformCanvasWin();
+
+  // For two-part init, call if you use the no-argument constructor above. Note
+  // that we want this to optionally match the Linux initialize if you only
+  // pass 3 arguments, hence the evil default argument.
+  bool initialize(int width, int height, bool is_opaque,
+                  HANDLE shared_section = NULL);
+
+  // These calls should surround calls to platform drawing routines, the DC
+  // returned by beginPlatformPaint is the DC that can be used to draw into.
+  // Call endPlatformPaint when you are done and want to use Skia operations
+  // again; this will synchronize the bitmap to Windows.
+  virtual HDC beginPlatformPaint();
+  virtual void endPlatformPaint();
+
+  // Returns the platform device pointer of the topmost rect with a non-empty
+  // clip. In practice, this is usually either the top layer or nothing, since
+  // we usually set the clip to new layers when we make them.
+  //
+  // If there is no layer that is not all clipped out, this will return a
+  // dummy device so callers do not have to check. If you are concerned about
+  // performance, check the clip before doing any painting.
+  //
+  // This is different than SkCanvas' getDevice, because that returns the
+  // bottommost device.
+  //
+  // Danger: the resulting device should not be saved. It will be invalidated
+  // by the next call to save() or restore().
+  PlatformDeviceWin& getTopPlatformDevice() const;
+
+ protected:
+  // Creates a device store for use by the canvas. We override this so that
+  // the device is always our own so we know that we can use GDI operations
+  // on it. Simply calls into createPlatformDevice().
+  virtual SkDevice* createDevice(SkBitmap::Config, int width, int height,
+                                 bool is_opaque, bool isForLayer);
+
+  // Creates a device store for use by the canvas. By default, it creates a
+  // BitmapPlatformDeviceWin. Can be overridden to change the object type.
+  virtual SkDevice* createPlatformDevice(int width, int height, bool is_opaque,
+                                         HANDLE shared_section);
+
+ private:
+  // Unimplemented.
+  virtual SkDevice* setBitmapDevice(const SkBitmap& bitmap);
+
+  // Disallow copy and assign.
+  PlatformCanvasWin(const PlatformCanvasWin&);
+  PlatformCanvasWin& operator=(const PlatformCanvasWin&);
+};
+
+// A class designed to help with WM_PAINT operations on Windows. It will
+// do BeginPaint/EndPaint on init/destruction, and will create the bitmap and
+// canvas with the correct size and transform for the dirty rect. The bitmap
+// will be automatically painted to the screen on destruction.
+//
+// You MUST call isEmpty before painting to determine if anything needs
+// painting. Sometimes the dirty rect can actually be empty, and this makes
+// the bitmap functions we call unhappy. The caller should not paint in this
+// case.
+//
+// Therefore, all you need to do is:
+//   case WM_PAINT: {
+//     gfx::PlatformCanvasWinPaint canvas(hwnd);
+//     if (!canvas.isEmpty()) {
+//       ... paint to the canvas ...
+//     }
+//     return 0;
+//   }
+template <class T>
+class CanvasPaintT : public T {
+ public:
+  CanvasPaintT(HWND hwnd) : hwnd_(hwnd), paint_dc_(NULL), for_paint_(true) {
+    memset(&ps_, 0, sizeof(ps_));
+    initPaint(true);
+  }
+
+  CanvasPaintT(HWND hwnd, bool opaque) : hwnd_(hwnd), paint_dc_(NULL),
+      for_paint_(true) {
+    memset(&ps_, 0, sizeof(ps_));
+    initPaint(opaque);
+  }
+
+  // Creates a CanvasPaintT for the specified region that paints to the
+  // specified dc. This does NOT do BeginPaint/EndPaint.
+  CanvasPaintT(HDC dc, bool opaque, int x, int y, int w, int h)
+      : hwnd_(NULL),
+        paint_dc_(dc),
+        for_paint_(false) {
+    memset(&ps_, 0, sizeof(ps_));
+    ps_.rcPaint.left = x;
+    ps_.rcPaint.right = x + w;
+    ps_.rcPaint.top = y;
+    ps_.rcPaint.bottom = y + h;
+    init(opaque);
+  }
+
+
+  virtual ~CanvasPaintT() {
+    if (!isEmpty()) {
+      restoreToCount(1);
+      // Commit the drawing to the screen
+      getTopPlatformDevice().drawToHDC(paint_dc_,
+                                       ps_.rcPaint.left, ps_.rcPaint.top,
+                                       NULL);
+    }
+    if (for_paint_)
+      EndPaint(hwnd_, &ps_);
+  }
+
+  // Returns true if the invalid region is empty. The caller should call this
+  // function to determine if anything needs painting.
+  bool isEmpty() const {
+    return ps_.rcPaint.right - ps_.rcPaint.left == 0 ||
+           ps_.rcPaint.bottom - ps_.rcPaint.top == 0;
+  }
+
+  // Use to access the Windows painting parameters, especially useful for
+  // getting the bounding rect for painting: paintstruct().rcPaint
+  const PAINTSTRUCT& paintStruct() const {
+    return ps_;
+  }
+
+  // Returns the DC that will be painted to
+  HDC paintDC() const {
+    return paint_dc_;
+  }
+
+ protected:
+  HWND hwnd_;
+  HDC paint_dc_;
+  PAINTSTRUCT ps_;
+
+ private:
+  void initPaint(bool opaque) {
+    paint_dc_ = BeginPaint(hwnd_, &ps_);
+
+    init(opaque);
+  }
+
+  void init(bool opaque) {
+    // FIXME(brettw) for ClearType, we probably want to expand the bounds of
+    // painting by one pixel so that the boundaries will be correct (ClearType
+    // text can depend on the adjacent pixel). Then we would paint just the
+    // inset pixels to the screen.
+    const int width = ps_.rcPaint.right - ps_.rcPaint.left;
+    const int height = ps_.rcPaint.bottom - ps_.rcPaint.top;
+    if (!initialize(width, height, opaque, NULL)) {
+      // Cause a deliberate crash;
+      *(char*) 0 = 0;
+    }
+
+    // This will bring the canvas into the screen coordinate system for the
+    // dirty rect
+    translate(SkIntToScalar(-ps_.rcPaint.left),
+              SkIntToScalar(-ps_.rcPaint.top));
+  }
+
+  // If true, this canvas was created for a BeginPaint.
+  const bool for_paint_;
+
+  // Disallow copy and assign.
+  CanvasPaintT(const CanvasPaintT&);
+  CanvasPaintT& operator=(const CanvasPaintT&);
+};
+
+typedef CanvasPaintT<PlatformCanvasWin> PlatformCanvasWinPaint;
+
+}  // namespace gfx
+
+#endif  // PlatformCanvasWin_h
+
diff --git a/base/gfx/platform_canvas_unittest.cc b/webkit/port/platform/graphics/skia/public/PlatformCanvas_unittest.cpp
index 8e227ad..8e227ad 100644
--- a/base/gfx/platform_canvas_unittest.cc
+++ b/webkit/port/platform/graphics/skia/public/PlatformCanvas_unittest.cpp
diff --git a/webkit/port/platform/graphics/skia/public/PlatformDevice.h b/webkit/port/platform/graphics/skia/public/PlatformDevice.h
new file mode 100644
index 0000000..3072e08
--- /dev/null
+++ b/webkit/port/platform/graphics/skia/public/PlatformDevice.h
@@ -0,0 +1,27 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Declare a platform-neutral name for this platform's device class
+// that can be used by upper-level classes that just need to pass a reference
+// around.
+
+#if defined(WIN32)
+#include "PlatformDeviceWin.h"
+#elif defined(__APPLE__)
+#include "PlatformDeviceMac.h"
+#elif defined(__linux__)
+#include "PlatformDeviceLinux.h"
+#endif
+
+namespace gfx {
+
+#if defined(WIN32)
+typedef PlatformDeviceWin PlatformDevice;
+#elif defined(__APPLE__)
+typedef PlatformDeviceMac PlatformDevice;
+#elif defined(__linux__)
+typedef PlatformDeviceLinux PlatformDevice;
+#endif
+
+}  // namespace gfx
diff --git a/base/gfx/platform_device_linux.cc b/webkit/port/platform/graphics/skia/public/PlatformDeviceLinux.cpp
index 1f948b1..50ffd51 100644
--- a/base/gfx/platform_device_linux.cc
+++ b/webkit/port/platform/graphics/skia/public/PlatformDeviceLinux.cpp
@@ -2,12 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/platform_device_linux.h"
-
-#include "base/logging.h"
-#include "SkMatrix.h"
-#include "SkPath.h"
-#include "SkUtils.h"
+#include "PlatformDeviceLinux.h"
 
 namespace gfx {
 
diff --git a/webkit/port/platform/graphics/skia/public/PlatformDeviceLinux.h b/webkit/port/platform/graphics/skia/public/PlatformDeviceLinux.h
new file mode 100644
index 0000000..7c853a4
--- /dev/null
+++ b/webkit/port/platform/graphics/skia/public/PlatformDeviceLinux.h
@@ -0,0 +1,25 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef PlatformDeviceLinux_h
+#define PlatformDeviceLinux_h
+
+#include "SkDevice.h"
+
+namespace gfx {
+
+// Blindly copying the mac hierarchy.
+class PlatformDeviceLinux : public SkDevice {
+ public:
+  // Returns if the preferred rendering engine is vectorial or bitmap based.
+  virtual bool IsVectorial() = 0;
+
+ protected:
+  // Forwards |bitmap| to SkDevice's constructor.
+  PlatformDeviceLinux(const SkBitmap& bitmap);
+};
+
+}  // namespace gfx
+
+#endif  // PlatformDeviceLinux_h
diff --git a/base/gfx/platform_device_mac.cc b/webkit/port/platform/graphics/skia/public/PlatformDeviceMac.cpp
index 93909f1..6addc22 100755
--- a/base/gfx/platform_device_mac.cc
+++ b/webkit/port/platform/graphics/skia/public/PlatformDeviceMac.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/platform_device_mac.h"
+#include "PlatformDeviceMac.h"
 
 #include "base/logging.h"
 #include "base/gfx/skia_utils_mac.h"
@@ -100,15 +100,15 @@ void PlatformDeviceMac::LoadTransformToCGContext(CGContextRef context,
   // CoreGraphics can concatenate transforms, but not reset the current one.
   // So in order to get the required behavior here, we need to first make
   // the current transformation matrix identity and only then load the new one.
-  
+
   // Reset matrix to identity.
   CGAffineTransform orig_cg_matrix = CGContextGetCTM(context);
   CGAffineTransform orig_cg_matrix_inv = CGAffineTransformInvert(orig_cg_matrix);
   CGContextConcatCTM(context, orig_cg_matrix_inv);
-  
+
   // assert that we have indeed returned to the identity Matrix.
   DCHECK(CGAffineTransformIsIdentity(CGContextGetCTM(context)));
-  
+
   // Convert xform to CG-land.
   // Our coordinate system is flipped to match WebKit's so we need to modify
   // the xform to match that.
@@ -118,9 +118,9 @@ void PlatformDeviceMac::LoadTransformToCGContext(CGContextRef context,
   size_t height = CGBitmapContextGetHeight(context);
   SkScalar ty = -matrix.getTranslateY(); // y axis is flipped.
   transformed_matrix.setTranslateY(ty + (SkScalar)height);
-  
+
   CGAffineTransform cg_matrix = SkMatrixToCGAffineTransform(transformed_matrix);
-  
+
   // Load final transform into context.
   CGContextConcatCTM(context, cg_matrix);
 }
@@ -156,6 +156,6 @@ void PlatformDeviceMac::LoadClippingRegionToCGContext(
     // hrgn = PathToRegion(context);
   }
 }
-  
+
 }  // namespace gfx
 
diff --git a/webkit/port/platform/graphics/skia/public/PlatformDeviceMac.h b/webkit/port/platform/graphics/skia/public/PlatformDeviceMac.h
new file mode 100755
index 0000000..0e1dc61
--- /dev/null
+++ b/webkit/port/platform/graphics/skia/public/PlatformDeviceMac.h
@@ -0,0 +1,86 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef PlatformDeviceMac_h
+#define PlatformDeviceMac_h
+
+#import <ApplicationServices/ApplicationServices.h>
+#include "SkDevice.h"
+
+class SkMatrix;
+class SkPath;
+class SkRegion;
+
+namespace gfx {
+
+// A device is basically a wrapper around SkBitmap that provides a surface for
+// SkCanvas to draw into. Our device provides a surface CoreGraphics can also
+// write to. It also provides functionality to play well with CG drawing
+// functions.
+// This class is abstract and must be subclassed. It provides the basic
+// interface to implement it either with or without a bitmap backend.
+class PlatformDeviceMac : public SkDevice {
+ public:
+  // The CGContext that corresponds to the bitmap, used for CoreGraphics
+  // operations drawing into the bitmap. This is possibly heavyweight, so it
+  // should exist only during one pass of rendering.
+  virtual CGContextRef GetBitmapContext() = 0;
+
+  // Draws to the given graphics context. If the bitmap context doesn't exist,
+  // this will temporarily create it. However, if you have created the bitmap
+  // context, it will be more efficient if you don't free it until after this
+  // call so it doesn't have to be created twice.  If src_rect is null, then
+  // the entirety of the source device will be copied.
+  virtual void DrawToContext(CGContextRef context, int x, int y,
+                             const CGRect* src_rect) = 0;
+
+  // Sets the opacity of each pixel in the specified region to be opaque.
+  void makeOpaque(int x, int y, int width, int height);
+
+  // Returns if the preferred rendering engine is vectorial or bitmap based.
+  virtual bool IsVectorial() = 0;
+
+  // On platforms where the native rendering API does not support rendering
+  // into bitmaps with a premultiplied alpha channel, this call is responsible
+  // for doing any fixup necessary.  It is not used on the Mac, since
+  // CoreGraphics can handle premultiplied alpha just fine.
+  virtual void fixupAlphaBeforeCompositing() = 0;
+
+  // Initializes the default settings and colors in a device context.
+  static void InitializeCGContext(CGContextRef context);
+
+  // Loads a SkPath into the CG context. The path can there after be used for
+  // clipping or as a stroke.
+  static void LoadPathToCGContext(CGContextRef context, const SkPath& path);
+
+  // Loads a SkRegion into the CG context.
+  static void LoadClippingRegionToCGContext(CGContextRef context,
+                                            const SkRegion& region,
+                                            const SkMatrix& transformation);
+
+ protected:
+  // Forwards |bitmap| to SkDevice's constructor.
+  PlatformDeviceMac(const SkBitmap& bitmap);
+
+  // Loads the specified Skia transform into the device context
+  static void LoadTransformToCGContext(CGContextRef context,
+                                       const SkMatrix& matrix);
+
+  // Function pointer used by the processPixels method for setting the alpha
+  // value of a particular pixel.
+  typedef void (*adjustAlpha)(uint32_t* pixel);
+
+  // Loops through each of the pixels in the specified range, invoking
+  // adjustor for the alpha value of each pixel.
+  virtual void processPixels(int x,
+                             int y,
+                             int width,
+                             int height,
+                             adjustAlpha adjustor) = 0;
+};
+
+}  // namespace gfx
+
+#endif  // PlatformDeviceMac_h
+
diff --git a/base/gfx/platform_device_win.cc b/webkit/port/platform/graphics/skia/public/PlatformDeviceWin.cpp
index a1e8568..65dcffc 100644
--- a/base/gfx/platform_device_win.cc
+++ b/webkit/port/platform/graphics/skia/public/PlatformDeviceWin.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/platform_device_win.h"
+#include "PlatformDeviceWin.h"
 
 #include "base/logging.h"
 #include "base/gfx/skia_utils.h"
@@ -132,7 +132,7 @@ void PlatformDeviceWin::LoadTransformToDC(HDC dc, const SkMatrix& matrix) {
 
 // static
 bool PlatformDeviceWin::SkPathToCubicPaths(CubicPaths* paths,
-                                        const SkPath& skpath) {
+                                           const SkPath& skpath) {
   paths->clear();
   CubicPath* current_path = NULL;
   SkPoint current_points[4];
@@ -195,8 +195,8 @@ bool PlatformDeviceWin::SkPathToCubicPaths(CubicPaths* paths,
 
 // static
 void PlatformDeviceWin::LoadClippingRegionToDC(HDC context,
-                                            const SkRegion& region,
-                                            const SkMatrix& transformation) {
+                                               const SkRegion& region,
+                                               const SkMatrix& transformation) {
   HRGN hrgn;
   if (region.isEmpty()) {
     // region can be empty, in which case everything will be clipped.
diff --git a/webkit/port/platform/graphics/skia/public/PlatformDeviceWin.h b/webkit/port/platform/graphics/skia/public/PlatformDeviceWin.h
new file mode 100644
index 0000000..48b7197
--- /dev/null
+++ b/webkit/port/platform/graphics/skia/public/PlatformDeviceWin.h
@@ -0,0 +1,98 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef PlatformDeviceWin_h
+#define PlatformDeviceWin_h
+
+#include <windows.h>
+
+#include <vector>
+
+#include "SkDevice.h"
+
+class SkMatrix;
+class SkPath;
+class SkRegion;
+
+namespace gfx {
+
+// A device is basically a wrapper around SkBitmap that provides a surface for
+// SkCanvas to draw into. Our device provides a surface Windows can also write
+// to. It also provides functionality to play well with GDI drawing functions.
+// This class is abstract and must be subclassed. It provides the basic
+// interface to implement it either with or without a bitmap backend.
+class PlatformDeviceWin : public SkDevice {
+ public:
+  // The DC that corresponds to the bitmap, used for GDI operations drawing
+  // into the bitmap. This is possibly heavyweight, so it should be existant
+  // only during one pass of rendering.
+  virtual HDC getBitmapDC() = 0;
+
+  // Draws to the given screen DC, if the bitmap DC doesn't exist, this will
+  // temporarily create it. However, if you have created the bitmap DC, it will
+  // be more efficient if you don't free it until after this call so it doesn't
+  // have to be created twice.  If src_rect is null, then the entirety of the
+  // source device will be copied.
+  virtual void drawToHDC(HDC dc, int x, int y, const RECT* src_rect) = 0;
+
+  // Invoke before using GDI functions. See description in platform_device.cc
+  // for specifics.
+  // NOTE: x,y,width and height are relative to the current transform.
+  virtual void prepareForGDI(int x, int y, int width, int height) { }
+
+  // Invoke after using GDI functions. See description in platform_device.cc
+  // for specifics.
+  // NOTE: x,y,width and height are relative to the current transform.
+  virtual void postProcessGDI(int x, int y, int width, int height) { }
+
+  // Sets the opacity of each pixel in the specified region to be opaque.
+  virtual void makeOpaque(int x, int y, int width, int height) { }
+
+  // Call this function to fix the alpha channels before compositing this layer
+  // onto another. Internally, the device uses a special alpha method to work
+  // around problems with Windows. This call will put the values into what
+  // Skia expects, so it can be composited onto other layers.
+  //
+  // After this call, no more drawing can be done because the
+  // alpha channels will be "correct", which, if this function is called again
+  // will make them wrong. See the implementation for more discussion.
+  virtual void fixupAlphaBeforeCompositing() { }
+
+  // Returns if the preferred rendering engine is vectorial or bitmap based.
+  virtual bool IsVectorial() = 0;
+
+  // Initializes the default settings and colors in a device context.
+  static void InitializeDC(HDC context);
+
+  // Loads a SkPath into the GDI context. The path can there after be used for
+  // clipping or as a stroke.
+  static void LoadPathToDC(HDC context, const SkPath& path);
+
+  // Loads a SkRegion into the GDI context.
+  static void LoadClippingRegionToDC(HDC context, const SkRegion& region,
+                                     const SkMatrix& transformation);
+
+ protected:
+  // Arrays must be inside structures.
+  struct CubicPoints {
+    SkPoint p[4];
+  };
+  typedef std::vector<CubicPoints> CubicPath;
+  typedef std::vector<CubicPath> CubicPaths;
+
+  // Forwards |bitmap| to SkDevice's constructor.
+  PlatformDeviceWin(const SkBitmap& bitmap);
+
+  // Loads the specified Skia transform into the device context, excluding
+  // perspective (which GDI doesn't support).
+  static void LoadTransformToDC(HDC dc, const SkMatrix& matrix);
+
+  // Transforms SkPath's paths into a series of cubic path.
+  static bool SkPathToCubicPaths(CubicPaths* paths, const SkPath& skpath);
+};
+
+}  // namespace gfx
+
+#endif  // PlatformDeviceWin_h
+
diff --git a/webkit/port/platform/graphics/skia/public/README b/webkit/port/platform/graphics/skia/public/README
new file mode 100644
index 0000000..a0dfcdf
--- /dev/null
+++ b/webkit/port/platform/graphics/skia/public/README
@@ -0,0 +1,3 @@
+The files in this directory must not depend on WebKit types since they are used
+by both the port and the Chromium application layer. They may only depend on
+Skia and the system libraries.
diff --git a/base/gfx/vector_canvas.cc b/webkit/port/platform/graphics/skia/public/VectorCanvas.cpp
index 440ee64..440ee64 100644
--- a/base/gfx/vector_canvas.cc
+++ b/webkit/port/platform/graphics/skia/public/VectorCanvas.cpp
diff --git a/webkit/port/platform/graphics/skia/public/VectorCanvas.h b/webkit/port/platform/graphics/skia/public/VectorCanvas.h
new file mode 100644
index 0000000..8538366
--- /dev/null
+++ b/webkit/port/platform/graphics/skia/public/VectorCanvas.h
@@ -0,0 +1,46 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef BASE_GFX_VECTOR_CANVAS_H_
+#define BASE_GFX_VECTOR_CANVAS_H_
+
+#include "base/gfx/platform_canvas_win.h"
+#include "base/gfx/vector_device.h"
+
+namespace gfx {
+
+// This class is a specialization of the regular PlatformCanvas. It is designed
+// to work with a VectorDevice to manage platform-specific drawing. It allows
+// using both Skia operations and platform-specific operations. It *doesn't*
+// support reading back from the bitmap backstore since it is not used.
+class VectorCanvas : public PlatformCanvasWin {
+ public:
+  VectorCanvas();
+  VectorCanvas(HDC dc, int width, int height);
+  virtual ~VectorCanvas();
+
+  // For two-part init, call if you use the no-argument constructor above
+  bool initialize(HDC context, int width, int height);
+
+  virtual SkBounder* setBounder(SkBounder*);
+  virtual SkDevice* createDevice(SkBitmap::Config config,
+                                 int width, int height,
+                                 bool is_opaque, bool isForLayer);
+  virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter);
+
+ private:
+  // |is_opaque| is unused. |shared_section| is in fact the HDC used for output.
+  virtual SkDevice* createPlatformDevice(int width, int height, bool is_opaque,
+                                         HANDLE shared_section);
+
+  // Returns true if the top device is vector based and not bitmap based.
+  bool IsTopDeviceVectorial() const;
+
+  DISALLOW_COPY_AND_ASSIGN(VectorCanvas);
+};
+
+}  // namespace gfx
+
+#endif  // BASE_GFX_VECTOR_CANVAS_H_
+
diff --git a/base/gfx/vector_canvas_unittest.cc b/webkit/port/platform/graphics/skia/public/VectorCanvas_unittest.cpp
index 60a79ba..28adff7 100644
--- a/base/gfx/vector_canvas_unittest.cc
+++ b/webkit/port/platform/graphics/skia/public/VectorCanvas_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/vector_canvas.h"
+#include "VectorCanvas.h"
 
 #include <vector>
 
@@ -355,7 +355,8 @@ void LoadPngFileToSkBitmap(const std::wstring& file, SkBitmap* bitmap) {
 
 // Streams an image.
 inline std::ostream& operator<<(std::ostream& out, const Image& image) {
-  return out << "Image(" << image.size() << ", " << image.row_length() << ")";
+  return out << "Image(" << image.size().width() << ", "
+             << image.size().height() << ", " << image.row_length() << ")";
 }
 
 // Runs simultaneously the same drawing commands on VectorCanvas and
diff --git a/base/gfx/vector_device.cc b/webkit/port/platform/graphics/skia/public/VectorDevice.cpp
index 26da338..2f5e3aa 100644
--- a/base/gfx/vector_device.cc
+++ b/webkit/port/platform/graphics/skia/public/VectorDevice.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/vector_device.h"
+#include "VectorDevice.h"
 
 #include "base/gfx/gdi_util.h"
 #include "base/gfx/skia_utils.h"
diff --git a/webkit/port/platform/graphics/skia/public/VectorDevice.h b/webkit/port/platform/graphics/skia/public/VectorDevice.h
new file mode 100644
index 0000000..8579689
--- /dev/null
+++ b/webkit/port/platform/graphics/skia/public/VectorDevice.h
@@ -0,0 +1,119 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef VectorDevice_h
+#define VectorDevice_h
+
+#include "base/basictypes.h"
+#include "base/gfx/platform_device_win.h"
+#include "SkMatrix.h"
+#include "SkRegion.h"
+
+namespace gfx {
+
+// A device is basically a wrapper around SkBitmap that provides a surface for
+// SkCanvas to draw into. This specific device is not not backed by a surface
+// and is thus unreadable. This is because the backend is completely vectorial.
+// This device is a simple wrapper over a Windows device context (HDC) handle.
+class VectorDevice : public PlatformDeviceWin {
+ public:
+  // Factory function. The DC is kept as the output context.
+  static VectorDevice* create(HDC dc, int width, int height);
+
+  VectorDevice(HDC dc, const SkBitmap& bitmap);
+  virtual ~VectorDevice();
+
+  virtual HDC getBitmapDC() {
+    return hdc_;
+  }
+
+  virtual void drawPaint(const SkDraw& draw, const SkPaint& paint);
+  virtual void drawPoints(const SkDraw& draw, SkCanvas::PointMode mode,
+                          size_t count, const SkPoint[], const SkPaint& paint);
+  virtual void drawRect(const SkDraw& draw, const SkRect& r,
+                        const SkPaint& paint);
+  virtual void drawPath(const SkDraw& draw, const SkPath& path,
+                        const SkPaint& paint);
+  virtual void drawBitmap(const SkDraw& draw, const SkBitmap& bitmap,
+                          const SkMatrix& matrix, const SkPaint& paint);
+  virtual void drawSprite(const SkDraw& draw, const SkBitmap& bitmap,
+                          int x, int y, const SkPaint& paint);
+  virtual void drawText(const SkDraw& draw, const void* text, size_t len,
+                        SkScalar x, SkScalar y, const SkPaint& paint);
+  virtual void drawPosText(const SkDraw& draw, const void* text, size_t len,
+                           const SkScalar pos[], SkScalar constY,
+                           int scalarsPerPos, const SkPaint& paint);
+  virtual void drawTextOnPath(const SkDraw& draw, const void* text, size_t len,
+                              const SkPath& path, const SkMatrix* matrix,
+                              const SkPaint& paint);
+  virtual void drawVertices(const SkDraw& draw, SkCanvas::VertexMode,
+                            int vertexCount,
+                            const SkPoint verts[], const SkPoint texs[],
+                            const SkColor colors[], SkXfermode* xmode,
+                            const uint16_t indices[], int indexCount,
+                            const SkPaint& paint);
+  virtual void drawDevice(const SkDraw& draw, SkDevice*, int x, int y,
+                          const SkPaint&);
+
+
+  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
+  virtual void drawToHDC(HDC dc, int x, int y, const RECT* src_rect);
+  virtual bool IsVectorial() { return true; }
+
+  void LoadClipRegion();
+
+ private:
+  // Applies the SkPaint's painting properties in the current GDI context, if
+  // possible. If GDI can't support all paint's properties, returns false. It
+  // doesn't execute the "commands" in SkPaint.
+  bool ApplyPaint(const SkPaint& paint);
+
+  // Selects a new object in the device context. It can be a pen, a brush, a
+  // clipping region, a bitmap or a font. Returns the old selected object.
+  HGDIOBJ SelectObject(HGDIOBJ object);
+
+  // Creates a brush according to SkPaint's properties.
+  bool CreateBrush(bool use_brush, const SkPaint& paint);
+
+  // Creates a pen according to SkPaint's properties.
+  bool CreatePen(bool use_pen, const SkPaint& paint);
+
+  // Restores back the previous objects (pen, brush, etc) after a paint command.
+  void Cleanup();
+
+  // Creates a brush according to SkPaint's properties.
+  bool CreateBrush(bool use_brush, COLORREF color);
+
+  // Creates a pen according to SkPaint's properties.
+  bool CreatePen(bool use_pen, COLORREF color, int stroke_width,
+                 float stroke_miter, DWORD pen_style);
+
+  // Draws a bitmap in the the device, using the currently loaded matrix.
+  void InternalDrawBitmap(const SkBitmap& bitmap, int x, int y,
+                          const SkPaint& paint);
+
+  // The Windows Device Context handle. It is the backend used with GDI drawing.
+  // This backend is write-only and vectorial.
+  HDC hdc_;
+
+  // Translation assigned to the DC: we need to keep track of this separately
+  // so it can be updated even if the DC isn't created yet.
+  SkMatrix transform_;
+
+  // The current clipping
+  SkRegion clip_region_;
+
+  // Previously selected brush before the current drawing.
+  HGDIOBJ previous_brush_;
+
+  // Previously selected pen before the current drawing.
+  HGDIOBJ previous_pen_;
+
+  DISALLOW_COPY_AND_ASSIGN(VectorDevice);
+};
+
+}  // namespace gfx
+
+#endif  // VectorDevice_h
+
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index fe47ba7..b12d344 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -176,6 +176,7 @@ test_files = [
     '$WEBKIT_DIR/glue/resource_fetcher_unittest.cc',
     '$WEBKIT_DIR/glue/webframe_unittest.cc',
     '$WEBKIT_DIR/port/platform/GKURL_unittest.cpp',
+    '$WEBKIT_DIR/port/platform/graphics/skia/public/PlatformCanvas_unittest.cpp',
     '$WEBKIT_DIR/port/platform/image-decoders/bmp/BMPImageDecoder_unittest.cpp',
     '$WEBKIT_DIR/port/platform/image-decoders/ico/ICOImageDecoder_unittest.cpp',
     '$WEBKIT_DIR/port/platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp',
@@ -190,6 +191,7 @@ if env['PLATFORM'] == 'win32':
       #'$WEBKIT_DIR/glue/stringimpl_unittest.cc',
       '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc',
       '$WEBKIT_DIR/port/platform/graphics/UniscribeHelper_unittest.cpp',
+      '$WEBKIT_DIR/port/platform/graphics/skia/public/VectorCanvas_unittest.cpp',
   ])
 
 test_shell_tests = env.ChromeTestProgram('test_shell_tests',
diff --git a/webkit/tools/test_shell/test_shell_tests.vcproj b/webkit/tools/test_shell/test_shell_tests.vcproj
index 8ca916d..38df275 100644
--- a/webkit/tools/test_shell/test_shell_tests.vcproj
+++ b/webkit/tools/test_shell/test_shell_tests.vcproj
@@ -367,6 +367,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\port\platform\graphics\skia\public\PlatformCanvas_unittest.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\plugin_tests.cc"
 				>
 			</File>
@@ -387,6 +391,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\port\platform\graphics\skia\public\VectorCanvas_unittest.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\glue\webframe_unittest.cc"
 				>
 			</File>
author	brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>	2008-11-19 18:52:38 +0000
committer	brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>	2008-11-19 18:52:38 +0000
commit	6165b4070b7e3a2fd33efd0eb66043c86f61d8b2 (patch)
tree	d2f7f195c13274ca524d264dc34639e276805325
parent	941ac7fca4afc89cb28ffa760f5a4a4ca077912c (diff)
download	chromium_src-6165b4070b7e3a2fd33efd0eb66043c86f61d8b2.zip chromium_src-6165b4070b7e3a2fd33efd0eb66043c86f61d8b2.tar.gz chromium_src-6165b4070b7e3a2fd33efd0eb66043c86f61d8b2.tar.bz2