solution: merging various changes - combines API violation fixes, asset and certificate changes, and the adding of qrcode dependency Change-Id: I0d26c589fabef3b6c46bac19bf6bc0d0adfe76f1 Tuleap: #1234

commit: 49f1b578d72039540f6d18c24611b89d98ff5344 [log] [tgz]
author: atraczyk <andreastraczyk@gmail.com> Thu Oct 27 12:33:28 2016 -0400
committer: Nicolas Jager <nicolas.jager@savoirfairelinux.com> Tue Nov 08 12:54:25 2016 -0400
tree: b4f3844443769349ee4e55326aa5b7fa1b76f115
parent: bd8238046f1fd861dc0ffed125ea30d2aa9f51bf [diff]
diff --git a/Assets/LockScreenLogo.scale-200.png b/Assets/LockScreenLogo.scale-200.png
index 735f57a..440781b 100644
--- a/Assets/LockScreenLogo.scale-200.png
+++ b/Assets/LockScreenLogo.scale-200.png
Binary files differ

diff --git a/Assets/SplashScreen.scale-200.png b/Assets/SplashScreen.scale-200.png
index 023e7f1..284f577 100644
--- a/Assets/SplashScreen.scale-200.png
+++ b/Assets/SplashScreen.scale-200.png
Binary files differ

diff --git a/Assets/Square150x150Logo.scale-200.png b/Assets/Square150x150Logo.scale-200.png
index af49fec..fec4a07 100644
--- a/Assets/Square150x150Logo.scale-200.png
+++ b/Assets/Square150x150Logo.scale-200.png
Binary files differ

diff --git a/Assets/Square44x44Logo.scale-200.png b/Assets/Square44x44Logo.scale-200.png
index ce342a2..267faa7 100644
--- a/Assets/Square44x44Logo.scale-200.png
+++ b/Assets/Square44x44Logo.scale-200.png
Binary files differ

diff --git a/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
index f6c02ce..3780aaa 100644
--- a/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
+++ b/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
Binary files differ

diff --git a/Assets/StoreLogo.png b/Assets/StoreLogo.png
index 7385b56..f9b5b7a 100644
--- a/Assets/StoreLogo.png
+++ b/Assets/StoreLogo.png
Binary files differ

diff --git a/Assets/Wide310x150Logo.scale-200.png b/Assets/Wide310x150Logo.scale-200.png
index 288995b..0fa598e 100644
--- a/Assets/Wide310x150Logo.scale-200.png
+++ b/Assets/Wide310x150Logo.scale-200.png
Binary files differ

diff --git a/MainPage.xaml.cpp b/MainPage.xaml.cpp
index 6d025ff..d0f44c2 100644
--- a/MainPage.xaml.cpp
+++ b/MainPage.xaml.cpp

@@ -46,13 +46,13 @@
 using namespace Windows::ApplicationModel::Activation;

 using namespace Windows::Graphics::Display;

 using namespace Windows::System;

+using namespace Concurrency;

 

 MainPage::MainPage()

 {

     InitializeComponent();

 

-

-

+    UserModel::instance->getUserData();

 

     Window::Current->SizeChanged += ref new WindowSizeChangedEventHandler(this, &MainPage::OnResize);

 

@@ -76,11 +76,11 @@
                        Platform::Object^>(this, &MainPage::DisplayProperties_DpiChanged));

 

     visibilityChangedEventToken = Window::Current->VisibilityChanged +=

-                                      ref new WindowVisibilityChangedEventHandler(this, &MainPage::Application_VisibilityChanged);

+        ref new WindowVisibilityChangedEventHandler(this, &MainPage::Application_VisibilityChanged);

     applicationSuspendingEventToken = Application::Current->Suspending +=

-                                          ref new SuspendingEventHandler(this, &MainPage::Application_Suspending);

+        ref new SuspendingEventHandler(this, &MainPage::Application_Suspending);

     applicationResumingEventToken = Application::Current->Resuming +=

-                                        ref new EventHandler<Object^>(this, &MainPage::Application_Resuming);

+        ref new EventHandler<Object^>(this, &MainPage::Application_Resuming);

 }

 

 void

@@ -126,7 +126,6 @@
 {

     RingD::instance->startDaemon();

     showLoadingOverlay(true, false);

-

 }

 

 void

@@ -371,9 +370,9 @@
     newSession->Reason = ExtendedExecutionReason::SavingData;

     newSession->Description = "Extended Execution";

     sessionRevokedToken = (newSession->Revoked += ref new TypedEventHandler<Object^,

-                           ExtendedExecutionRevokedEventArgs^>(this, &MainPage::SessionRevoked));

+        ExtendedExecutionRevokedEventArgs^>(this, &MainPage::SessionRevoked));

     return create_task(newSession->RequestExtensionAsync())

-    .then([=](ExtendedExecutionResult result) {

+        .then([=](ExtendedExecutionResult result){

         try {

             switch (result)

             {

@@ -398,4 +397,4 @@
             RingDebug::instance->WriteLine("Exception: Extended Execution Request");

         }

     });

-}
\ No newline at end of file
+}


diff --git a/Package.StoreAssociation.xml b/Package.StoreAssociation.xml
new file mode 100644
index 0000000..556d0a7
--- /dev/null
+++ b/Package.StoreAssociation.xml

@@ -0,0 +1,368 @@
+<?xml version="1.0" encoding="utf-8"?>

+<StoreAssociation xmlns="http://schemas.microsoft.com/appx/2010/storeassociation">

+  <Publisher>CN=8121A5F7-3CA1-4CAA-92B2-4F595B011941</Publisher>

+  <PublisherDisplayName>Savoir-faire Linux</PublisherDisplayName>

+  <GeneratePackageHash>http://www.w3.org/2001/04/xmlenc#sha256</GeneratePackageHash>

+  <SupportedLocales>

+    <Language Code="af" InMinimumRequirementSet="true" />

+    <Language Code="af-za" InMinimumRequirementSet="true" />

+    <Language Code="am" InMinimumRequirementSet="true" />

+    <Language Code="am-et" InMinimumRequirementSet="true" />

+    <Language Code="ar" InMinimumRequirementSet="true" />

+    <Language Code="ar-ae" InMinimumRequirementSet="true" />

+    <Language Code="ar-bh" InMinimumRequirementSet="true" />

+    <Language Code="ar-dz" InMinimumRequirementSet="true" />

+    <Language Code="ar-eg" InMinimumRequirementSet="true" />

+    <Language Code="ar-iq" InMinimumRequirementSet="true" />

+    <Language Code="ar-jo" InMinimumRequirementSet="true" />

+    <Language Code="ar-kw" InMinimumRequirementSet="true" />

+    <Language Code="ar-lb" InMinimumRequirementSet="true" />

+    <Language Code="ar-ly" InMinimumRequirementSet="true" />

+    <Language Code="ar-ma" InMinimumRequirementSet="true" />

+    <Language Code="ar-om" InMinimumRequirementSet="true" />

+    <Language Code="ar-qa" InMinimumRequirementSet="true" />

+    <Language Code="ar-sa" InMinimumRequirementSet="true" />

+    <Language Code="ar-sy" InMinimumRequirementSet="true" />

+    <Language Code="ar-tn" InMinimumRequirementSet="true" />

+    <Language Code="ar-ye" InMinimumRequirementSet="true" />

+    <Language Code="as" InMinimumRequirementSet="true" />

+    <Language Code="as-in" InMinimumRequirementSet="true" />

+    <Language Code="az" InMinimumRequirementSet="true" />

+    <Language Code="az-arab" InMinimumRequirementSet="true" />

+    <Language Code="az-arab-az" InMinimumRequirementSet="true" />

+    <Language Code="az-cyrl" InMinimumRequirementSet="true" />

+    <Language Code="az-cyrl-az" InMinimumRequirementSet="true" />

+    <Language Code="az-latn" InMinimumRequirementSet="true" />

+    <Language Code="az-latn-az" InMinimumRequirementSet="true" />

+    <Language Code="be" InMinimumRequirementSet="true" />

+    <Language Code="be-by" InMinimumRequirementSet="true" />

+    <Language Code="bg" InMinimumRequirementSet="true" />

+    <Language Code="bg-bg" InMinimumRequirementSet="true" />

+    <Language Code="bn" InMinimumRequirementSet="true" />

+    <Language Code="bn-bd" InMinimumRequirementSet="true" />

+    <Language Code="bn-in" InMinimumRequirementSet="true" />

+    <Language Code="bs" InMinimumRequirementSet="true" />

+    <Language Code="bs-cyrl" InMinimumRequirementSet="true" />

+    <Language Code="bs-cyrl-ba" InMinimumRequirementSet="true" />

+    <Language Code="bs-latn" InMinimumRequirementSet="true" />

+    <Language Code="bs-latn-ba" InMinimumRequirementSet="true" />

+    <Language Code="ca" InMinimumRequirementSet="true" />

+    <Language Code="ca-es" InMinimumRequirementSet="true" />

+    <Language Code="ca-es-valencia" InMinimumRequirementSet="true" />

+    <Language Code="chr-cher" InMinimumRequirementSet="true" />

+    <Language Code="chr-cher-us" InMinimumRequirementSet="true" />

+    <Language Code="chr-latn" InMinimumRequirementSet="true" />

+    <Language Code="cs" InMinimumRequirementSet="true" />

+    <Language Code="cs-cz" InMinimumRequirementSet="true" />

+    <Language Code="cy" InMinimumRequirementSet="true" />

+    <Language Code="cy-gb" InMinimumRequirementSet="true" />

+    <Language Code="da" InMinimumRequirementSet="true" />

+    <Language Code="da-dk" InMinimumRequirementSet="true" />

+    <Language Code="de" InMinimumRequirementSet="true" />

+    <Language Code="de-at" InMinimumRequirementSet="true" />

+    <Language Code="de-ch" InMinimumRequirementSet="true" />

+    <Language Code="de-de" InMinimumRequirementSet="true" />

+    <Language Code="de-li" InMinimumRequirementSet="true" />

+    <Language Code="de-lu" InMinimumRequirementSet="true" />

+    <Language Code="el" InMinimumRequirementSet="true" />

+    <Language Code="el-gr" InMinimumRequirementSet="true" />

+    <Language Code="en" InMinimumRequirementSet="true" />

+    <Language Code="en-011" InMinimumRequirementSet="true" />

+    <Language Code="en-014" InMinimumRequirementSet="true" />

+    <Language Code="en-018" InMinimumRequirementSet="true" />

+    <Language Code="en-021" InMinimumRequirementSet="true" />

+    <Language Code="en-029" InMinimumRequirementSet="true" />

+    <Language Code="en-053" InMinimumRequirementSet="true" />

+    <Language Code="en-au" InMinimumRequirementSet="true" />

+    <Language Code="en-bz" InMinimumRequirementSet="true" />

+    <Language Code="en-ca" InMinimumRequirementSet="true" />

+    <Language Code="en-gb" InMinimumRequirementSet="true" />

+    <Language Code="en-hk" InMinimumRequirementSet="true" />

+    <Language Code="en-id" InMinimumRequirementSet="true" />

+    <Language Code="en-ie" InMinimumRequirementSet="true" />

+    <Language Code="en-in" InMinimumRequirementSet="true" />

+    <Language Code="en-jm" InMinimumRequirementSet="true" />

+    <Language Code="en-kz" InMinimumRequirementSet="true" />

+    <Language Code="en-mt" InMinimumRequirementSet="true" />

+    <Language Code="en-my" InMinimumRequirementSet="true" />

+    <Language Code="en-nz" InMinimumRequirementSet="true" />

+    <Language Code="en-ph" InMinimumRequirementSet="true" />

+    <Language Code="en-pk" InMinimumRequirementSet="true" />

+    <Language Code="en-sg" InMinimumRequirementSet="true" />

+    <Language Code="en-tt" InMinimumRequirementSet="true" />

+    <Language Code="en-us" InMinimumRequirementSet="true" />

+    <Language Code="en-vn" InMinimumRequirementSet="true" />

+    <Language Code="en-za" InMinimumRequirementSet="true" />

+    <Language Code="en-zw" InMinimumRequirementSet="true" />

+    <Language Code="es" InMinimumRequirementSet="true" />

+    <Language Code="es-019" InMinimumRequirementSet="true" />

+    <Language Code="es-419" InMinimumRequirementSet="true" />

+    <Language Code="es-ar" InMinimumRequirementSet="true" />

+    <Language Code="es-bo" InMinimumRequirementSet="true" />

+    <Language Code="es-cl" InMinimumRequirementSet="true" />

+    <Language Code="es-co" InMinimumRequirementSet="true" />

+    <Language Code="es-cr" InMinimumRequirementSet="true" />

+    <Language Code="es-do" InMinimumRequirementSet="true" />

+    <Language Code="es-ec" InMinimumRequirementSet="true" />

+    <Language Code="es-es" InMinimumRequirementSet="true" />

+    <Language Code="es-gt" InMinimumRequirementSet="true" />

+    <Language Code="es-hn" InMinimumRequirementSet="true" />

+    <Language Code="es-mx" InMinimumRequirementSet="true" />

+    <Language Code="es-ni" InMinimumRequirementSet="true" />

+    <Language Code="es-pa" InMinimumRequirementSet="true" />

+    <Language Code="es-pe" InMinimumRequirementSet="true" />

+    <Language Code="es-pr" InMinimumRequirementSet="true" />

+    <Language Code="es-py" InMinimumRequirementSet="true" />

+    <Language Code="es-sv" InMinimumRequirementSet="true" />

+    <Language Code="es-us" InMinimumRequirementSet="true" />

+    <Language Code="es-uy" InMinimumRequirementSet="true" />

+    <Language Code="es-ve" InMinimumRequirementSet="true" />

+    <Language Code="et" InMinimumRequirementSet="true" />

+    <Language Code="et-ee" InMinimumRequirementSet="true" />

+    <Language Code="eu" InMinimumRequirementSet="true" />

+    <Language Code="eu-es" InMinimumRequirementSet="true" />

+    <Language Code="fa" InMinimumRequirementSet="true" />

+    <Language Code="fa-ir" InMinimumRequirementSet="true" />

+    <Language Code="fi" InMinimumRequirementSet="true" />

+    <Language Code="fi-fi" InMinimumRequirementSet="true" />

+    <Language Code="fil" InMinimumRequirementSet="true" />

+    <Language Code="fil-latn" InMinimumRequirementSet="true" />

+    <Language Code="fil-ph" InMinimumRequirementSet="true" />

+    <Language Code="fr" InMinimumRequirementSet="true" />

+    <Language Code="fr-011" InMinimumRequirementSet="true" />

+    <Language Code="fr-015" InMinimumRequirementSet="true" />

+    <Language Code="fr-021" InMinimumRequirementSet="true" />

+    <Language Code="fr-029" InMinimumRequirementSet="true" />

+    <Language Code="fr-155" InMinimumRequirementSet="true" />

+    <Language Code="fr-be" InMinimumRequirementSet="true" />

+    <Language Code="fr-ca" InMinimumRequirementSet="true" />

+    <Language Code="fr-cd" InMinimumRequirementSet="true" />

+    <Language Code="fr-ch" InMinimumRequirementSet="true" />

+    <Language Code="fr-ci" InMinimumRequirementSet="true" />

+    <Language Code="fr-cm" InMinimumRequirementSet="true" />

+    <Language Code="fr-fr" InMinimumRequirementSet="true" />

+    <Language Code="fr-ht" InMinimumRequirementSet="true" />

+    <Language Code="fr-lu" InMinimumRequirementSet="true" />

+    <Language Code="fr-ma" InMinimumRequirementSet="true" />

+    <Language Code="fr-mc" InMinimumRequirementSet="true" />

+    <Language Code="fr-ml" InMinimumRequirementSet="true" />

+    <Language Code="fr-re" InMinimumRequirementSet="true" />

+    <Language Code="frc-latn" InMinimumRequirementSet="true" />

+    <Language Code="frp-latn" InMinimumRequirementSet="true" />

+    <Language Code="ga" InMinimumRequirementSet="true" />

+    <Language Code="ga-ie" InMinimumRequirementSet="true" />

+    <Language Code="gd-gb" InMinimumRequirementSet="true" />

+    <Language Code="gd-latn" InMinimumRequirementSet="true" />

+    <Language Code="gl" InMinimumRequirementSet="true" />

+    <Language Code="gl-es" InMinimumRequirementSet="true" />

+    <Language Code="gu" InMinimumRequirementSet="true" />

+    <Language Code="gu-in" InMinimumRequirementSet="true" />

+    <Language Code="ha" InMinimumRequirementSet="true" />

+    <Language Code="ha-latn" InMinimumRequirementSet="true" />

+    <Language Code="ha-latn-ng" InMinimumRequirementSet="true" />

+    <Language Code="he" InMinimumRequirementSet="true" />

+    <Language Code="he-il" InMinimumRequirementSet="true" />

+    <Language Code="hi" InMinimumRequirementSet="true" />

+    <Language Code="hi-in" InMinimumRequirementSet="true" />

+    <Language Code="hr" InMinimumRequirementSet="true" />

+    <Language Code="hr-ba" InMinimumRequirementSet="true" />

+    <Language Code="hr-hr" InMinimumRequirementSet="true" />

+    <Language Code="hu" InMinimumRequirementSet="true" />

+    <Language Code="hu-hu" InMinimumRequirementSet="true" />

+    <Language Code="hy" InMinimumRequirementSet="true" />

+    <Language Code="hy-am" InMinimumRequirementSet="true" />

+    <Language Code="id" InMinimumRequirementSet="true" />

+    <Language Code="id-id" InMinimumRequirementSet="true" />

+    <Language Code="ig-latn" InMinimumRequirementSet="true" />

+    <Language Code="ig-ng" InMinimumRequirementSet="true" />

+    <Language Code="is" InMinimumRequirementSet="true" />

+    <Language Code="is-is" InMinimumRequirementSet="true" />

+    <Language Code="it" InMinimumRequirementSet="true" />

+    <Language Code="it-ch" InMinimumRequirementSet="true" />

+    <Language Code="it-it" InMinimumRequirementSet="true" />

+    <Language Code="iu-cans" InMinimumRequirementSet="true" />

+    <Language Code="iu-latn" InMinimumRequirementSet="true" />

+    <Language Code="iu-latn-ca" InMinimumRequirementSet="true" />

+    <Language Code="ja" InMinimumRequirementSet="true" />

+    <Language Code="ja-jp" InMinimumRequirementSet="true" />

+    <Language Code="ka" InMinimumRequirementSet="true" />

+    <Language Code="ka-ge" InMinimumRequirementSet="true" />

+    <Language Code="kk" InMinimumRequirementSet="true" />

+    <Language Code="kk-kz" InMinimumRequirementSet="true" />

+    <Language Code="km" InMinimumRequirementSet="true" />

+    <Language Code="km-kh" InMinimumRequirementSet="true" />

+    <Language Code="kn" InMinimumRequirementSet="true" />

+    <Language Code="kn-in" InMinimumRequirementSet="true" />

+    <Language Code="ko" InMinimumRequirementSet="true" />

+    <Language Code="ko-kr" InMinimumRequirementSet="true" />

+    <Language Code="kok" InMinimumRequirementSet="true" />

+    <Language Code="kok-in" InMinimumRequirementSet="true" />

+    <Language Code="ku-arab" InMinimumRequirementSet="true" />

+    <Language Code="ku-arab-iq" InMinimumRequirementSet="true" />

+    <Language Code="ky-cyrl" InMinimumRequirementSet="true" />

+    <Language Code="ky-kg" InMinimumRequirementSet="true" />

+    <Language Code="lb" InMinimumRequirementSet="true" />

+    <Language Code="lb-lu" InMinimumRequirementSet="true" />

+    <Language Code="lo" InMinimumRequirementSet="true" />

+    <Language Code="lo-la" InMinimumRequirementSet="true" />

+    <Language Code="lt" InMinimumRequirementSet="true" />

+    <Language Code="lt-lt" InMinimumRequirementSet="true" />

+    <Language Code="lv" InMinimumRequirementSet="true" />

+    <Language Code="lv-lv" InMinimumRequirementSet="true" />

+    <Language Code="mi" InMinimumRequirementSet="true" />

+    <Language Code="mi-latn" InMinimumRequirementSet="true" />

+    <Language Code="mi-nz" InMinimumRequirementSet="true" />

+    <Language Code="mk" InMinimumRequirementSet="true" />

+    <Language Code="mk-mk" InMinimumRequirementSet="true" />

+    <Language Code="ml" InMinimumRequirementSet="true" />

+    <Language Code="ml-in" InMinimumRequirementSet="true" />

+    <Language Code="mn-cyrl" InMinimumRequirementSet="true" />

+    <Language Code="mn-mn" InMinimumRequirementSet="true" />

+    <Language Code="mn-mong" InMinimumRequirementSet="true" />

+    <Language Code="mn-phag" InMinimumRequirementSet="true" />

+    <Language Code="mr" InMinimumRequirementSet="true" />

+    <Language Code="mr-in" InMinimumRequirementSet="true" />

+    <Language Code="ms" InMinimumRequirementSet="true" />

+    <Language Code="ms-bn" InMinimumRequirementSet="true" />

+    <Language Code="ms-my" InMinimumRequirementSet="true" />

+    <Language Code="mt" InMinimumRequirementSet="true" />

+    <Language Code="mt-mt" InMinimumRequirementSet="true" />

+    <Language Code="nb" InMinimumRequirementSet="true" />

+    <Language Code="nb-no" InMinimumRequirementSet="true" />

+    <Language Code="ne" InMinimumRequirementSet="true" />

+    <Language Code="ne-np" InMinimumRequirementSet="true" />

+    <Language Code="nl" InMinimumRequirementSet="true" />

+    <Language Code="nl-be" InMinimumRequirementSet="true" />

+    <Language Code="nl-nl" InMinimumRequirementSet="true" />

+    <Language Code="nn" InMinimumRequirementSet="true" />

+    <Language Code="nn-no" InMinimumRequirementSet="true" />

+    <Language Code="no" InMinimumRequirementSet="true" />

+    <Language Code="no-no" InMinimumRequirementSet="true" />

+    <Language Code="nso" InMinimumRequirementSet="true" />

+    <Language Code="nso-za" InMinimumRequirementSet="true" />

+    <Language Code="or" InMinimumRequirementSet="true" />

+    <Language Code="or-in" InMinimumRequirementSet="true" />

+    <Language Code="pa" InMinimumRequirementSet="true" />

+    <Language Code="pa-arab" InMinimumRequirementSet="true" />

+    <Language Code="pa-arab-pk" InMinimumRequirementSet="true" />

+    <Language Code="pa-deva" InMinimumRequirementSet="true" />

+    <Language Code="pa-in" InMinimumRequirementSet="true" />

+    <Language Code="pl" InMinimumRequirementSet="true" />

+    <Language Code="pl-pl" InMinimumRequirementSet="true" />

+    <Language Code="prs" InMinimumRequirementSet="true" />

+    <Language Code="prs-af" InMinimumRequirementSet="true" />

+    <Language Code="prs-arab" InMinimumRequirementSet="true" />

+    <Language Code="pt" InMinimumRequirementSet="true" />

+    <Language Code="pt-br" InMinimumRequirementSet="true" />

+    <Language Code="pt-pt" InMinimumRequirementSet="true" />

+    <Language Code="quc-latn" InMinimumRequirementSet="true" />

+    <Language Code="qut-gt" InMinimumRequirementSet="true" />

+    <Language Code="qut-latn" InMinimumRequirementSet="true" />

+    <Language Code="quz" InMinimumRequirementSet="true" />

+    <Language Code="quz-bo" InMinimumRequirementSet="true" />

+    <Language Code="quz-ec" InMinimumRequirementSet="true" />

+    <Language Code="quz-pe" InMinimumRequirementSet="true" />

+    <Language Code="ro" InMinimumRequirementSet="true" />

+    <Language Code="ro-ro" InMinimumRequirementSet="true" />

+    <Language Code="ru" InMinimumRequirementSet="true" />

+    <Language Code="ru-ru" InMinimumRequirementSet="true" />

+    <Language Code="rw" InMinimumRequirementSet="true" />

+    <Language Code="rw-rw" InMinimumRequirementSet="true" />

+    <Language Code="sd-arab" InMinimumRequirementSet="true" />

+    <Language Code="sd-arab-pk" InMinimumRequirementSet="true" />

+    <Language Code="sd-deva" InMinimumRequirementSet="true" />

+    <Language Code="si" InMinimumRequirementSet="true" />

+    <Language Code="si-lk" InMinimumRequirementSet="true" />

+    <Language Code="sk" InMinimumRequirementSet="true" />

+    <Language Code="sk-sk" InMinimumRequirementSet="true" />

+    <Language Code="sl" InMinimumRequirementSet="true" />

+    <Language Code="sl-si" InMinimumRequirementSet="true" />

+    <Language Code="sq" InMinimumRequirementSet="true" />

+    <Language Code="sq-al" InMinimumRequirementSet="true" />

+    <Language Code="sr" InMinimumRequirementSet="true" />

+    <Language Code="sr-cyrl" InMinimumRequirementSet="true" />

+    <Language Code="sr-cyrl-ba" InMinimumRequirementSet="true" />

+    <Language Code="sr-cyrl-cs" InMinimumRequirementSet="true" />

+    <Language Code="sr-cyrl-me" InMinimumRequirementSet="true" />

+    <Language Code="sr-cyrl-rs" InMinimumRequirementSet="true" />

+    <Language Code="sr-latn" InMinimumRequirementSet="true" />

+    <Language Code="sr-latn-ba" InMinimumRequirementSet="true" />

+    <Language Code="sr-latn-cs" InMinimumRequirementSet="true" />

+    <Language Code="sr-latn-me" InMinimumRequirementSet="true" />

+    <Language Code="sr-latn-rs" InMinimumRequirementSet="true" />

+    <Language Code="sv" InMinimumRequirementSet="true" />

+    <Language Code="sv-fi" InMinimumRequirementSet="true" />

+    <Language Code="sv-se" InMinimumRequirementSet="true" />

+    <Language Code="sw" InMinimumRequirementSet="true" />

+    <Language Code="sw-ke" InMinimumRequirementSet="true" />

+    <Language Code="ta" InMinimumRequirementSet="true" />

+    <Language Code="ta-in" InMinimumRequirementSet="true" />

+    <Language Code="te" InMinimumRequirementSet="true" />

+    <Language Code="te-in" InMinimumRequirementSet="true" />

+    <Language Code="tg-arab" InMinimumRequirementSet="true" />

+    <Language Code="tg-cyrl" InMinimumRequirementSet="true" />

+    <Language Code="tg-cyrl-tj" InMinimumRequirementSet="true" />

+    <Language Code="tg-latn" InMinimumRequirementSet="true" />

+    <Language Code="th" InMinimumRequirementSet="true" />

+    <Language Code="th-th" InMinimumRequirementSet="true" />

+    <Language Code="ti" InMinimumRequirementSet="true" />

+    <Language Code="ti-et" InMinimumRequirementSet="true" />

+    <Language Code="tk-cyrl" InMinimumRequirementSet="true" />

+    <Language Code="tk-cyrl-tr" InMinimumRequirementSet="true" />

+    <Language Code="tk-latn" InMinimumRequirementSet="true" />

+    <Language Code="tk-latn-tr" InMinimumRequirementSet="true" />

+    <Language Code="tk-tm" InMinimumRequirementSet="true" />

+    <Language Code="tn" InMinimumRequirementSet="true" />

+    <Language Code="tn-bw" InMinimumRequirementSet="true" />

+    <Language Code="tn-za" InMinimumRequirementSet="true" />

+    <Language Code="tr" InMinimumRequirementSet="true" />

+    <Language Code="tr-tr" InMinimumRequirementSet="true" />

+    <Language Code="tt-arab" InMinimumRequirementSet="true" />

+    <Language Code="tt-cyrl" InMinimumRequirementSet="true" />

+    <Language Code="tt-latn" InMinimumRequirementSet="true" />

+    <Language Code="tt-ru" InMinimumRequirementSet="true" />

+    <Language Code="ug-arab" InMinimumRequirementSet="true" />

+    <Language Code="ug-cn" InMinimumRequirementSet="true" />

+    <Language Code="ug-cyrl" InMinimumRequirementSet="true" />

+    <Language Code="ug-latn" InMinimumRequirementSet="true" />

+    <Language Code="uk" InMinimumRequirementSet="true" />

+    <Language Code="uk-ua" InMinimumRequirementSet="true" />

+    <Language Code="ur" InMinimumRequirementSet="true" />

+    <Language Code="ur-pk" InMinimumRequirementSet="true" />

+    <Language Code="uz" InMinimumRequirementSet="true" />

+    <Language Code="uz-cyrl" InMinimumRequirementSet="true" />

+    <Language Code="uz-latn" InMinimumRequirementSet="true" />

+    <Language Code="uz-latn-uz" InMinimumRequirementSet="true" />

+    <Language Code="vi" InMinimumRequirementSet="true" />

+    <Language Code="vi-vn" InMinimumRequirementSet="true" />

+    <Language Code="wo" InMinimumRequirementSet="true" />

+    <Language Code="wo-sn" InMinimumRequirementSet="true" />

+    <Language Code="xh" InMinimumRequirementSet="true" />

+    <Language Code="xh-za" InMinimumRequirementSet="true" />

+    <Language Code="yo-latn" InMinimumRequirementSet="true" />

+    <Language Code="yo-ng" InMinimumRequirementSet="true" />

+    <Language Code="zh" InMinimumRequirementSet="true" />

+    <Language Code="zh-cn" InMinimumRequirementSet="true" />

+    <Language Code="zh-hans" InMinimumRequirementSet="true" />

+    <Language Code="zh-hans-cn" InMinimumRequirementSet="true" />

+    <Language Code="zh-hans-sg" InMinimumRequirementSet="true" />

+    <Language Code="zh-hant" InMinimumRequirementSet="true" />

+    <Language Code="zh-hant-hk" InMinimumRequirementSet="true" />

+    <Language Code="zh-hant-mo" InMinimumRequirementSet="true" />

+    <Language Code="zh-hant-tw" InMinimumRequirementSet="true" />

+    <Language Code="zh-hk" InMinimumRequirementSet="true" />

+    <Language Code="zh-mo" InMinimumRequirementSet="true" />

+    <Language Code="zh-sg" InMinimumRequirementSet="true" />

+    <Language Code="zh-tw" InMinimumRequirementSet="true" />

+    <Language Code="zu" InMinimumRequirementSet="true" />

+    <Language Code="zu-za" InMinimumRequirementSet="true" />

+  </SupportedLocales>

+  <ProductReservedInfo>

+    <MainPackageIdentityName>Savoir-faireLinux.GNURing</MainPackageIdentityName>

+    <ReservedNames>

+      <ReservedName>GNU Ring</ReservedName>

+    </ReservedNames>

+  </ProductReservedInfo>

+  <AccountPackageIdentityNames />

+  <PackageInfoList LandingUrl="https://developer.microsoft.com/dashboard/Application?appId=9NBLGGH43D70" />

+</StoreAssociation>
\ No newline at end of file

diff --git a/Package.appxmanifest b/Package.appxmanifest
index 75be018..eaa7397 100644
--- a/Package.appxmanifest
+++ b/Package.appxmanifest

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">

-  <Identity Name="ring-client-uwp-multi-device" Publisher="CN=user" Version="2.0.3.0" />

+  <Identity Name="Savoir-faireLinux.GNURing" Publisher="CN=8121A5F7-3CA1-4CAA-92B2-4F595B011941" Version="1.1.0.0" />

   <mp:PhoneIdentity PhoneProductId="2385953f-9019-423d-aa82-d1bbacfa258b" PhonePublisherId="00000000-0000-0000-0000-000000000000" />

   <Properties>

-    <DisplayName>ring-client-uwp</DisplayName>

-    <PublisherDisplayName>Savoir-Faire Linux</PublisherDisplayName>

+    <DisplayName>GNU Ring</DisplayName>

+    <PublisherDisplayName>Savoir-faire Linux</PublisherDisplayName>

     <Logo>Assets\StoreLogo.png</Logo>

   </Properties>

   <Dependencies>

@@ -15,7 +15,7 @@
   </Resources>

   <Applications>

     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="RingClientUWP.App">

-      <uap:VisualElements DisplayName="ring-client-uwp-md" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="ring-client-uwp" BackgroundColor="transparent">

+      <uap:VisualElements DisplayName="GNU Ring" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="ring-client-uwp" BackgroundColor="transparent">

         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">

         </uap:DefaultTile>

         <uap:SplashScreen Image="Assets\SplashScreen.png" />

@@ -32,13 +32,11 @@
     <uap:Capability Name="blockedChatMessages" />

     <uap:Capability Name="chat" />

     <uap:Capability Name="contacts" />

-    <uap:Capability Name="enterpriseAuthentication" />

     <uap:Capability Name="musicLibrary" />

     <uap:Capability Name="objects3D" />

     <uap:Capability Name="phoneCall" />

     <uap:Capability Name="picturesLibrary" />

     <uap:Capability Name="removableStorage" />

-    <uap:Capability Name="sharedUserCertificates" />

     <uap:Capability Name="userAccountInformation" />

     <uap:Capability Name="videosLibrary" />

     <uap:Capability Name="voipCall" />

@@ -48,4 +46,4 @@
     <DeviceCapability Name="proximity" />

     <DeviceCapability Name="webcam" />

   </Capabilities>

-</Package>
\ No newline at end of file
+</Package>


diff --git a/RingD.cpp b/RingD.cpp
index b382650..98039fc 100644
--- a/RingD.cpp
+++ b/RingD.cpp

@@ -43,6 +43,8 @@
 using namespace RingClientUWP::Utils;

 using namespace RingClientUWP::ViewModel;

 

+using namespace Windows::System;

+

 void

 RingClientUWP::RingD::reloadAccountList()

 {

@@ -535,6 +537,18 @@
         };

         registerCallHandlers(getAppPathHandler);

 

+        std::map<std::string, SharedCallback> getAppUserNameHandler =

+        {

+            DRing::exportable_callback<DRing::ConfigurationSignal::GetAppUserName>

+            ([this](std::vector<std::string>* unames) {

+                unames->emplace_back(Utils::toString(

+                    UserModel::instance->firstName +

+                    "." +

+                    UserModel::instance->lastName));

+            })

+        };

+        registerCallHandlers(getAppUserNameHandler);

+

         std::map<std::string, SharedCallback> incomingVideoHandlers =

         {

             DRing::exportable_callback<DRing::VideoSignal::DeviceEvent>

@@ -834,6 +848,13 @@
     return CallStatus::NONE;

 }

 

+String^

+RingD::getUserName()

+{

+    auto users = User::FindAllAsync();

+    return nullptr;

+}

+

 Vector<String^>^ RingClientUWP::RingD::translateKnownRingDevices(const std::map<std::string, std::string> devices)

 {

     auto devicesList = ref new Vector<String^>();


diff --git a/RingD.h b/RingD.h
index 725e873..89c66ac 100644
--- a/RingD.h
+++ b/RingD.h

@@ -89,6 +89,7 @@
     void placeCall(Contact^ contact);

     /*void cancelOutGoingCall2(String^ callId);*/ // marche pas

     CallStatus translateCallStatus(String^ state);

+    String^ getUserName();

     Vector<String^>^ translateKnownRingDevices(const std::map<std::string, std::string> devices);

 

     void hangUpCall2(String^ callId);


diff --git a/UserModel.cpp b/UserModel.cpp
new file mode 100644
index 0000000..b17caee
--- /dev/null
+++ b/UserModel.cpp

@@ -0,0 +1,28 @@
+#include "pch.h"

+

+#include "UserModel.h"

+

+using namespace RingClientUWP;

+

+void

+UserModel::getUserData()

+{

+    create_task(User::FindAllAsync())

+        .then([=](IVectorView<User^>^ users) {

+        for (size_t index = 0; index < users->Size; index++) {

+            auto user = users->GetAt(index);

+            if (user->AuthenticationStatus == UserAuthenticationStatus::LocallyAuthenticated &&

+                user->Type == UserType::LocalUser) {

+                User^ currentUser = user;

+                create_task(currentUser->GetPropertyAsync(KnownUserProperties::FirstName))

+                    .then([=](Object^ result) {

+                    firstName = safe_cast<String^>(result);

+                });

+                create_task(currentUser->GetPropertyAsync(KnownUserProperties::LastName))

+                    .then([&](Object^ result) {

+                    lastName = safe_cast<String^>(result);

+                });

+            }

+        }

+    });

+}
\ No newline at end of file

diff --git a/UserModel.h b/UserModel.h
new file mode 100644
index 0000000..5527b9f
--- /dev/null
+++ b/UserModel.h

@@ -0,0 +1,33 @@
+#pragma once

+#include <pch.h>

+

+using namespace Platform;

+using namespace Windows::Foundation;

+using namespace Windows::Foundation::Collections;

+

+namespace RingClientUWP

+{

+

+public ref class UserModel sealed

+{

+internal:

+    /* singleton */

+    static property UserModel^ instance

+    {

+        UserModel^ get()

+        {

+            static UserModel^ instance_ = ref new UserModel();

+            return instance_;

+        }

+    }

+

+    property String^ firstName;

+    property String^ lastName;

+

+    void getUserData();

+

+private:

+    UserModel() { };

+};

+

+}
\ No newline at end of file

diff --git a/Utils.h b/Utils.h
index f832d74..c597e1c 100644
--- a/Utils.h
+++ b/Utils.h

@@ -21,7 +21,10 @@
 

 using namespace Platform;

 using namespace Platform::Collections;

+using namespace Windows::Foundation;

+using namespace Windows::Foundation::Collections;

 using namespace Windows::Storage;

+using namespace Windows::System;

 

 typedef Windows::UI::Xaml::Visibility VIS;

 


diff --git a/_language-fr.appx b/_language-fr.appx
new file mode 100644
index 0000000..4499648
--- /dev/null
+++ b/_language-fr.appx
Binary files differ

diff --git a/_pkginfo.txt b/_pkginfo.txt
new file mode 100644
index 0000000..c767856
--- /dev/null
+++ b/_pkginfo.txt

@@ -0,0 +1 @@
+C:\Users\andreas.traczyk\Desktop\tests\ring-client-uwp_1.1.0.0\ring-client-uwp_1.1.0.0_x64.appxbundle


diff --git a/_scale-100.appx b/_scale-100.appx
new file mode 100644
index 0000000..60b3c6f
--- /dev/null
+++ b/_scale-100.appx
Binary files differ

diff --git a/_scale-125.appx b/_scale-125.appx
new file mode 100644
index 0000000..0d6bc4d
--- /dev/null
+++ b/_scale-125.appx
Binary files differ

diff --git a/_scale-150.appx b/_scale-150.appx
new file mode 100644
index 0000000..7cdfbd1
--- /dev/null
+++ b/_scale-150.appx
Binary files differ

diff --git a/_scale-400.appx b/_scale-400.appx
new file mode 100644
index 0000000..21884ba
--- /dev/null
+++ b/_scale-400.appx
Binary files differ

diff --git a/contrib/qrencode-win32/vc8/.gitignore b/contrib/qrencode-win32/vc8/.gitignore
new file mode 100644
index 0000000..329f3e5
--- /dev/null
+++ b/contrib/qrencode-win32/vc8/.gitignore

@@ -0,0 +1 @@
+.build/
\ No newline at end of file

diff --git a/contrib/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj b/contrib/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj
index ca475d6..16d97a3 100644
--- a/contrib/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj
+++ b/contrib/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj

@@ -5,18 +5,34 @@
       <Configuration>Debug-Dll</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug-Dll|x64">

+      <Configuration>Debug-Dll</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

     <ProjectConfiguration Include="Debug-Lib|Win32">

       <Configuration>Debug-Lib</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug-Lib|x64">

+      <Configuration>Debug-Lib</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

     <ProjectConfiguration Include="Release-Dll|Win32">

       <Configuration>Release-Dll</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

+    <ProjectConfiguration Include="Release-Dll|x64">

+      <Configuration>Release-Dll</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

     <ProjectConfiguration Include="Release-Lib|Win32">

       <Configuration>Release-Lib</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

+    <ProjectConfiguration Include="Release-Lib|x64">

+      <Configuration>Release-Lib</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectGuid>{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}</ProjectGuid>

@@ -30,37 +46,71 @@
     <CharacterSet>MultiByte</CharacterSet>

     <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|x64'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <PlatformToolset>v140</PlatformToolset>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'" Label="Configuration">

     <ConfigurationType>StaticLibrary</ConfigurationType>

     <PlatformToolset>v140</PlatformToolset>

     <CharacterSet>MultiByte</CharacterSet>

   </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|x64'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <PlatformToolset>v140</PlatformToolset>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <PlatformToolset>v140</PlatformToolset>

     <CharacterSet>MultiByte</CharacterSet>

     <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <PlatformToolset>v140</PlatformToolset>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|Win32'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <PlatformToolset>v140</PlatformToolset>

     <CharacterSet>MultiByte</CharacterSet>

   </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <PlatformToolset>v140</PlatformToolset>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

   <ImportGroup Label="ExtensionSettings">

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>14.0.25420.1</_ProjectFileVersion>

@@ -70,11 +120,17 @@
     <IntDir>../.build/$(ProjectName)/$(Configuration)\</IntDir>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'">

     <OutDir>../.build/$(Configuration)\</OutDir>

     <IntDir>../.build/$(ProjectName)/$(Configuration)\</IntDir>

     <LinkIncremental>false</LinkIncremental>

   </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'">

+    <LinkIncremental>false</LinkIncremental>

+  </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'">

     <OutDir>../.build/$(Configuration)\</OutDir>

     <IntDir>../.build/$(ProjectName)/$(Configuration)\</IntDir>

@@ -104,6 +160,26 @@
       <TargetMachine>MachineX86</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libpng15d.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>..\qrcode\png;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <ModuleDefinitionFile>qrcodelib.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+    </Link>

+  </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'">

     <ClCompile>

       <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

@@ -124,6 +200,26 @@
       <TargetMachine>MachineX86</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'">

+    <ClCompile>

+      <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libpng15.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>..\qrcode\png;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <ModuleDefinitionFile>qrcodelib.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+    </Link>

+  </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

@@ -137,6 +233,19 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

     </ClCompile>

   </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|x64'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+  </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|Win32'">

     <ClCompile>

       <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

@@ -147,6 +256,17 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

     </ClCompile>

   </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|x64'">

+    <ClCompile>

+      <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+  </ItemDefinitionGroup>

   <ItemGroup>

     <ClCompile Include="..\..\bitstream.c" />

     <ClCompile Include="..\..\mask.c" />


diff --git a/pch.h b/pch.h
index 0be8155..1f42cda 100644
--- a/pch.h
+++ b/pch.h

@@ -38,6 +38,7 @@
 #include "Contact.h"

 #include "ContactsViewModel.h"

 #include "Conversation.h"

+#include "UserModel.h"

 #include "MainPage.xaml.h"

 #include "SmartPanelItem.h"

 #include "SmartPanelItemsViewModel.h"


diff --git a/ring-client-uwp.sln b/ring-client-uwp.sln
index 856964d..503bada 100644
--- a/ring-client-uwp.sln
+++ b/ring-client-uwp.sln

@@ -6,6 +6,7 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-client-uwp", "ring-client-uwp.vcxproj", "{90928671-346F-42E4-934F-7A7A512A2D11}"

 	ProjectSection(ProjectDependencies) = postProject

 		{79F8DE42-595D-49D9-A66F-55244FD9DCC3} = {79F8DE42-595D-49D9-A66F-55244FD9DCC3}

+		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C} = {9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}

 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-daemon", "..\ring-daemon\MSVC\ring-daemon.vcxproj", "{79F8DE42-595D-49D9-A66F-55244FD9DCC3}"

@@ -62,8 +63,6 @@
 EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pjproject", "pjproject", "{B39BB8BB-3E02-42EB-B747-19ACB57B6BE6}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "..\ring-daemon\contrib\portaudio\MSVC\portaudio.vcxproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libupnp", "..\ring-daemon\contrib\libupnp\build\VS2015\libupnp.vcxproj", "{6227F51A-1498-4C4A-B213-F6FDED605125}"

 EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libupnp", "libupnp", "{27B9320A-DA7E-4849-BCB7-4DBA266499C8}"

@@ -73,6 +72,9 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ixml", "..\ring-daemon\contrib\libupnp\build\VS2015\ixml.vcxproj", "{9C2C266D-35A3-465F-A297-0E21D54E5C89}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadutil", "..\ring-daemon\contrib\libupnp\build\VS2015\threadutil.vcxproj", "{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}"

+	ProjectSection(ProjectDependencies) = postProject

+		{EA0E0510-749F-47B2-9F53-565CB4893771} = {EA0E0510-749F-47B2-9F53-565CB4893771}

+	EndProjectSection

 EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "portaudio", "portaudio", "{30AAB4B5-1D0C-4D51-A360-64FEAF6E6AE3}"

 EndProject

@@ -170,16 +172,30 @@
 		{0C4EAC26-4AAC-3525-BA45-916F44CFD660} = {0C4EAC26-4AAC-3525-BA45-916F44CFD660}

 		{C00D492D-9474-4F78-80BF-86F6F337E81B} = {C00D492D-9474-4F78-80BF-86F6F337E81B}

 		{0DC9504B-4FF5-4590-97B3-FFD4C04F2893} = {0DC9504B-4FF5-4590-97B3-FFD4C04F2893}

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99} = {0A18A071-125E-442F-AFF7-A3F68ABECF99}

+		{23913386-5333-4C93-B3F0-0227AFF77B49} = {23913386-5333-4C93-B3F0-0227AFF77B49}

 		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}

 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2} = {23D7679C-764C-4E02-8B29-BB882CEEEFE2}

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293} = {039AC2C4-C1BE-4B3F-BC4A-4541B2066293}

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD} = {A02FD1CC-618B-428D-AC46-91A2A12D0DCD}

 		{711397CE-E5D5-467D-9457-8716C047E50C} = {711397CE-E5D5-467D-9457-8716C047E50C}

 		{65B6B9E6-4D10-484B-BD8A-156FCA00DD4A} = {65B6B9E6-4D10-484B-BD8A-156FCA00DD4A}

 	EndProjectSection

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio-UWP", "..\ring-daemon\contrib\portaudio\MSVC\portaudio-UWP\portaudio-UWP.vcxproj", "{23913386-5333-4C93-B3F0-0227AFF77B49}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pthreads", "pthreads", "{AAAB0FBB-A16E-4814-8918-0E25B278243B}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthreads-UWP-S", "..\ring-daemon\contrib\pthreads\MSVC\pthreads-UWP-S\pthreads-UWP-S.vcxproj", "{EA0E0510-749F-47B2-9F53-565CB4893771}"

+EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "boost", "boost", "{A185856B-E055-4594-9268-57C897A81F90}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "random", "..\ring-daemon\contrib\boost\MSVC\random\random.vcxproj", "{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "system", "..\ring-daemon\contrib\boost\MSVC\system\system.vcxproj", "{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}"

+EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contrib client", "contrib client", "{6EBA7EA6-20F5-40F9-96E3-32706D9ABD58}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qrcodelib", "..\..\..\qrencode-win32\qrencode-win32\vc8\qrcodelib\qrcodelib.vcxproj", "{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qrcodelib", "contrib\qrencode-win32\vc8\qrcodelib\qrcodelib.vcxproj", "{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}"

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -2791,116 +2807,6 @@
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Static|x64.Build.0 = Release-Static|x64

 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Static|x86.ActiveCfg = Release-Static|Win32

 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Static|x86.Build.0 = Release-Static|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|ARM.ActiveCfg = Debug|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.ActiveCfg = Debug|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.Build.0 = Debug|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x86.ActiveCfg = Debug|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x86.Build.0 = Debug|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugDLL|ARM.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugDLL|ARM.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Dll|ARM.ActiveCfg = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Dll|ARM.Build.0 = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugDLL|x64.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugDLL|x64.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Dll|x64.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Dll|x64.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugDLL|x86.ActiveCfg = DebugLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugDLL|x86.Build.0 = DebugLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Dll|x86.ActiveCfg = DebugLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Dll|x86.Build.0 = DebugLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugDLLStaticDeps|ARM.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugDLLStaticDeps|ARM.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugDLLStaticDeps|x64.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugDLLStaticDeps|x64.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugDLLStaticDeps|x86.ActiveCfg = DebugLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugDLLStaticDeps|x86.Build.0 = DebugLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Dynamic|ARM.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Dynamic|ARM.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Dynamic|x64.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Dynamic|x64.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Dynamic|x86.ActiveCfg = DebugLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Dynamic|x86.Build.0 = DebugLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugLib|ARM.ActiveCfg = DebugLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Lib|ARM.ActiveCfg = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Lib|ARM.Build.0 = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugLib|x64.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugLib|x64.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Lib|x64.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Lib|x64.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugLib|x86.ActiveCfg = DebugLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DebugLib|x86.Build.0 = DebugLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Lib|x86.ActiveCfg = DebugLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Lib|x86.Build.0 = DebugLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Static|ARM.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Static|ARM.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Static|x64.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Static|x64.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Static|x86.ActiveCfg = DebugLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug-Static|x86.Build.0 = DebugLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DLL-Import Debug|ARM.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DLL-Import Debug|ARM.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DLL-Import Debug|x64.ActiveCfg = Debug|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DLL-Import Debug|x64.Build.0 = Debug|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DLL-Import Debug|x86.ActiveCfg = Debug|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DLL-Import Debug|x86.Build.0 = Debug|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DLL-Import Release|ARM.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DLL-Import Release|ARM.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DLL-Import Release|x64.ActiveCfg = Release|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DLL-Import Release|x64.Build.0 = Release|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DLL-Import Release|x86.ActiveCfg = Release|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.DLL-Import Release|x86.Build.0 = Release|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|ARM.ActiveCfg = Release|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.ActiveCfg = Release|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.Build.0 = Release|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x86.ActiveCfg = Release|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x86.Build.0 = Release|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseDLL|ARM.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseDLL|ARM.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Dll|ARM.ActiveCfg = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Dll|ARM.Build.0 = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseDLL|x64.ActiveCfg = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseDLL|x64.Build.0 = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Dll|x64.ActiveCfg = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Dll|x64.Build.0 = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseDLL|x86.ActiveCfg = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseDLL|x86.Build.0 = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Dll|x86.ActiveCfg = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Dll|x86.Build.0 = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseDLLStaticDeps|ARM.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseDLLStaticDeps|ARM.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseDLLStaticDeps|x64.ActiveCfg = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseDLLStaticDeps|x64.Build.0 = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseDLLStaticDeps|x86.ActiveCfg = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseDLLStaticDeps|x86.Build.0 = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Dynamic|ARM.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Dynamic|ARM.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Dynamic|x64.ActiveCfg = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Dynamic|x64.Build.0 = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Dynamic|x86.ActiveCfg = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Dynamic|x86.Build.0 = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseLib|ARM.ActiveCfg = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Lib|ARM.ActiveCfg = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Lib|ARM.Build.0 = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseLib|x64.ActiveCfg = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseLib|x64.Build.0 = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Lib|x64.ActiveCfg = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Lib|x64.Build.0 = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseLib|x86.ActiveCfg = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseLib|x86.Build.0 = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Lib|x86.ActiveCfg = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Lib|x86.Build.0 = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseLTO|ARM.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseLTO|ARM.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseLTO|x64.ActiveCfg = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseLTO|x64.Build.0 = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseLTO|x86.ActiveCfg = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.ReleaseLTO|x86.Build.0 = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Static|ARM.ActiveCfg = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Static|ARM.Build.0 = DebugLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Static|x64.ActiveCfg = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Static|x64.Build.0 = ReleaseLib|x64

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Static|x86.ActiveCfg = ReleaseLib|Win32

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release-Static|x86.Build.0 = ReleaseLib|Win32

 		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|ARM.ActiveCfg = Debug|Win32

 		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|x64.ActiveCfg = Debug|x64

 		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|x64.Build.0 = Debug|x64

@@ -5439,6 +5345,414 @@
 		{6BD59A09-0768-40D3-A04B-10F95555689B}.Release-Static|x64.Build.0 = Release|x64

 		{6BD59A09-0768-40D3-A04B-10F95555689B}.Release-Static|x86.ActiveCfg = Release|Win32

 		{6BD59A09-0768-40D3-A04B-10F95555689B}.Release-Static|x86.Build.0 = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug|ARM.ActiveCfg = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug|ARM.Build.0 = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug|x64.ActiveCfg = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug|x64.Build.0 = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug|x86.ActiveCfg = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug|x86.Build.0 = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugDLL|ARM.ActiveCfg = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugDLL|ARM.Build.0 = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Dll|ARM.ActiveCfg = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugDLL|x64.ActiveCfg = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugDLL|x64.Build.0 = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Dll|x64.ActiveCfg = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugDLL|x86.ActiveCfg = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugDLL|x86.Build.0 = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Dll|x86.ActiveCfg = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugDLLStaticDeps|ARM.ActiveCfg = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugDLLStaticDeps|ARM.Build.0 = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Dynamic|ARM.ActiveCfg = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Dynamic|ARM.Build.0 = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Dynamic|x64.ActiveCfg = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Dynamic|x64.Build.0 = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Dynamic|x86.ActiveCfg = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Dynamic|x86.Build.0 = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugLib|ARM.ActiveCfg = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugLib|ARM.Build.0 = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Lib|ARM.ActiveCfg = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugLib|x64.ActiveCfg = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugLib|x64.Build.0 = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Lib|x64.ActiveCfg = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugLib|x86.ActiveCfg = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DebugLib|x86.Build.0 = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Lib|x86.ActiveCfg = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Static|ARM.ActiveCfg = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Static|ARM.Build.0 = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Static|x64.ActiveCfg = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Static|x64.Build.0 = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Static|x86.ActiveCfg = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Debug-Static|x86.Build.0 = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DLL-Import Debug|ARM.ActiveCfg = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DLL-Import Debug|ARM.Build.0 = Debug|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DLL-Import Debug|x64.ActiveCfg = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DLL-Import Debug|x64.Build.0 = Debug|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DLL-Import Debug|x86.ActiveCfg = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DLL-Import Debug|x86.Build.0 = Debug|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DLL-Import Release|ARM.ActiveCfg = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DLL-Import Release|ARM.Build.0 = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DLL-Import Release|x64.ActiveCfg = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DLL-Import Release|x64.Build.0 = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DLL-Import Release|x86.ActiveCfg = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.DLL-Import Release|x86.Build.0 = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release|ARM.ActiveCfg = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release|ARM.Build.0 = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release|x64.ActiveCfg = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release|x64.Build.0 = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release|x86.ActiveCfg = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release|x86.Build.0 = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseDLL|ARM.ActiveCfg = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseDLL|ARM.Build.0 = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Dll|ARM.ActiveCfg = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseDLL|x64.ActiveCfg = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseDLL|x64.Build.0 = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Dll|x64.ActiveCfg = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseDLL|x86.ActiveCfg = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseDLL|x86.Build.0 = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Dll|x86.ActiveCfg = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseDLLStaticDeps|ARM.ActiveCfg = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseDLLStaticDeps|ARM.Build.0 = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Dynamic|ARM.ActiveCfg = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Dynamic|ARM.Build.0 = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Dynamic|x64.ActiveCfg = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Dynamic|x64.Build.0 = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Dynamic|x86.ActiveCfg = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Dynamic|x86.Build.0 = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseLib|ARM.ActiveCfg = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseLib|ARM.Build.0 = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Lib|ARM.ActiveCfg = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseLib|x64.ActiveCfg = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseLib|x64.Build.0 = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Lib|x64.ActiveCfg = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseLib|x86.ActiveCfg = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseLib|x86.Build.0 = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Lib|x86.ActiveCfg = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseLTO|ARM.ActiveCfg = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseLTO|ARM.Build.0 = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseLTO|x64.ActiveCfg = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseLTO|x64.Build.0 = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseLTO|x86.ActiveCfg = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.ReleaseLTO|x86.Build.0 = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Static|ARM.ActiveCfg = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Static|ARM.Build.0 = Release|ARM

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Static|x64.ActiveCfg = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Static|x64.Build.0 = Release|x64

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Static|x86.ActiveCfg = Release|Win32

+		{23913386-5333-4C93-B3F0-0227AFF77B49}.Release-Static|x86.Build.0 = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug|ARM.ActiveCfg = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug|ARM.Build.0 = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug|x64.ActiveCfg = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug|x64.Build.0 = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug|x86.ActiveCfg = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug|x86.Build.0 = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugDLL|ARM.ActiveCfg = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugDLL|ARM.Build.0 = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Dll|ARM.ActiveCfg = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugDLL|x64.ActiveCfg = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugDLL|x64.Build.0 = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Dll|x64.ActiveCfg = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugDLL|x86.ActiveCfg = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugDLL|x86.Build.0 = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Dll|x86.ActiveCfg = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugDLLStaticDeps|ARM.ActiveCfg = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugDLLStaticDeps|ARM.Build.0 = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Dynamic|ARM.ActiveCfg = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Dynamic|ARM.Build.0 = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Dynamic|x64.ActiveCfg = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Dynamic|x64.Build.0 = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Dynamic|x86.ActiveCfg = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Dynamic|x86.Build.0 = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugLib|ARM.ActiveCfg = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugLib|ARM.Build.0 = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Lib|ARM.ActiveCfg = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugLib|x64.ActiveCfg = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugLib|x64.Build.0 = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Lib|x64.ActiveCfg = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugLib|x86.ActiveCfg = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DebugLib|x86.Build.0 = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Lib|x86.ActiveCfg = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Static|ARM.ActiveCfg = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Static|ARM.Build.0 = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Static|x64.ActiveCfg = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Static|x64.Build.0 = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Static|x86.ActiveCfg = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Debug-Static|x86.Build.0 = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DLL-Import Debug|ARM.ActiveCfg = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DLL-Import Debug|ARM.Build.0 = Debug|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DLL-Import Debug|x64.ActiveCfg = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DLL-Import Debug|x64.Build.0 = Debug|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DLL-Import Debug|x86.ActiveCfg = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DLL-Import Debug|x86.Build.0 = Debug|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DLL-Import Release|ARM.ActiveCfg = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DLL-Import Release|ARM.Build.0 = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DLL-Import Release|x64.ActiveCfg = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DLL-Import Release|x64.Build.0 = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DLL-Import Release|x86.ActiveCfg = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.DLL-Import Release|x86.Build.0 = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release|ARM.ActiveCfg = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release|ARM.Build.0 = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release|x64.ActiveCfg = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release|x64.Build.0 = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release|x86.ActiveCfg = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release|x86.Build.0 = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseDLL|ARM.ActiveCfg = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseDLL|ARM.Build.0 = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Dll|ARM.ActiveCfg = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseDLL|x64.ActiveCfg = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseDLL|x64.Build.0 = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Dll|x64.ActiveCfg = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseDLL|x86.ActiveCfg = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseDLL|x86.Build.0 = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Dll|x86.ActiveCfg = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseDLLStaticDeps|ARM.ActiveCfg = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseDLLStaticDeps|ARM.Build.0 = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Dynamic|ARM.ActiveCfg = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Dynamic|ARM.Build.0 = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Dynamic|x64.ActiveCfg = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Dynamic|x64.Build.0 = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Dynamic|x86.ActiveCfg = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Dynamic|x86.Build.0 = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseLib|ARM.ActiveCfg = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseLib|ARM.Build.0 = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Lib|ARM.ActiveCfg = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseLib|x64.ActiveCfg = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseLib|x64.Build.0 = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Lib|x64.ActiveCfg = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseLib|x86.ActiveCfg = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseLib|x86.Build.0 = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Lib|x86.ActiveCfg = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseLTO|ARM.ActiveCfg = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseLTO|ARM.Build.0 = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseLTO|x64.ActiveCfg = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseLTO|x64.Build.0 = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseLTO|x86.ActiveCfg = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.ReleaseLTO|x86.Build.0 = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Static|ARM.ActiveCfg = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Static|ARM.Build.0 = Release|ARM

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Static|x64.ActiveCfg = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Static|x64.Build.0 = Release|x64

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Static|x86.ActiveCfg = Release|Win32

+		{EA0E0510-749F-47B2-9F53-565CB4893771}.Release-Static|x86.Build.0 = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug|ARM.ActiveCfg = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug|ARM.Build.0 = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug|x64.ActiveCfg = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug|x64.Build.0 = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug|x86.ActiveCfg = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug|x86.Build.0 = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugDLL|ARM.ActiveCfg = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugDLL|ARM.Build.0 = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Dll|ARM.ActiveCfg = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugDLL|x64.ActiveCfg = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugDLL|x64.Build.0 = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Dll|x64.ActiveCfg = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugDLL|x86.ActiveCfg = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugDLL|x86.Build.0 = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Dll|x86.ActiveCfg = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugDLLStaticDeps|ARM.ActiveCfg = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugDLLStaticDeps|ARM.Build.0 = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Dynamic|ARM.ActiveCfg = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Dynamic|ARM.Build.0 = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Dynamic|x64.ActiveCfg = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Dynamic|x64.Build.0 = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Dynamic|x86.ActiveCfg = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Dynamic|x86.Build.0 = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugLib|ARM.ActiveCfg = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugLib|ARM.Build.0 = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Lib|ARM.ActiveCfg = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugLib|x64.ActiveCfg = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugLib|x64.Build.0 = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Lib|x64.ActiveCfg = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugLib|x86.ActiveCfg = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DebugLib|x86.Build.0 = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Lib|x86.ActiveCfg = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Static|ARM.ActiveCfg = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Static|ARM.Build.0 = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Static|x64.ActiveCfg = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Static|x64.Build.0 = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Static|x86.ActiveCfg = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Debug-Static|x86.Build.0 = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DLL-Import Debug|ARM.ActiveCfg = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DLL-Import Debug|ARM.Build.0 = Debug|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DLL-Import Debug|x64.ActiveCfg = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DLL-Import Debug|x64.Build.0 = Debug|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DLL-Import Debug|x86.ActiveCfg = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DLL-Import Debug|x86.Build.0 = Debug|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DLL-Import Release|ARM.ActiveCfg = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DLL-Import Release|ARM.Build.0 = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DLL-Import Release|x64.ActiveCfg = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DLL-Import Release|x64.Build.0 = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DLL-Import Release|x86.ActiveCfg = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.DLL-Import Release|x86.Build.0 = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release|ARM.ActiveCfg = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release|ARM.Build.0 = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release|x64.ActiveCfg = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release|x64.Build.0 = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release|x86.ActiveCfg = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release|x86.Build.0 = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseDLL|ARM.ActiveCfg = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseDLL|ARM.Build.0 = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Dll|ARM.ActiveCfg = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseDLL|x64.ActiveCfg = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseDLL|x64.Build.0 = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Dll|x64.ActiveCfg = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseDLL|x86.ActiveCfg = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseDLL|x86.Build.0 = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Dll|x86.ActiveCfg = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseDLLStaticDeps|ARM.ActiveCfg = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseDLLStaticDeps|ARM.Build.0 = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Dynamic|ARM.ActiveCfg = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Dynamic|ARM.Build.0 = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Dynamic|x64.ActiveCfg = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Dynamic|x64.Build.0 = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Dynamic|x86.ActiveCfg = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Dynamic|x86.Build.0 = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseLib|ARM.ActiveCfg = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseLib|ARM.Build.0 = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Lib|ARM.ActiveCfg = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseLib|x64.ActiveCfg = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseLib|x64.Build.0 = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Lib|x64.ActiveCfg = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseLib|x86.ActiveCfg = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseLib|x86.Build.0 = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Lib|x86.ActiveCfg = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseLTO|ARM.ActiveCfg = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseLTO|ARM.Build.0 = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseLTO|x64.ActiveCfg = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseLTO|x64.Build.0 = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseLTO|x86.ActiveCfg = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.ReleaseLTO|x86.Build.0 = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Static|ARM.ActiveCfg = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Static|ARM.Build.0 = Release|ARM

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Static|x64.ActiveCfg = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Static|x64.Build.0 = Release|x64

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Static|x86.ActiveCfg = Release|Win32

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293}.Release-Static|x86.Build.0 = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug|ARM.ActiveCfg = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug|ARM.Build.0 = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug|x64.ActiveCfg = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug|x64.Build.0 = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug|x86.ActiveCfg = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug|x86.Build.0 = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugDLL|ARM.ActiveCfg = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugDLL|ARM.Build.0 = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Dll|ARM.ActiveCfg = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugDLL|x64.ActiveCfg = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugDLL|x64.Build.0 = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Dll|x64.ActiveCfg = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugDLL|x86.ActiveCfg = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugDLL|x86.Build.0 = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Dll|x86.ActiveCfg = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugDLLStaticDeps|ARM.ActiveCfg = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugDLLStaticDeps|ARM.Build.0 = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Dynamic|ARM.ActiveCfg = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Dynamic|ARM.Build.0 = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Dynamic|x64.ActiveCfg = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Dynamic|x64.Build.0 = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Dynamic|x86.ActiveCfg = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Dynamic|x86.Build.0 = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugLib|ARM.ActiveCfg = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugLib|ARM.Build.0 = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Lib|ARM.ActiveCfg = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugLib|x64.ActiveCfg = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugLib|x64.Build.0 = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Lib|x64.ActiveCfg = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugLib|x86.ActiveCfg = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DebugLib|x86.Build.0 = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Lib|x86.ActiveCfg = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Static|ARM.ActiveCfg = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Static|ARM.Build.0 = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Static|x64.ActiveCfg = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Static|x64.Build.0 = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Static|x86.ActiveCfg = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Debug-Static|x86.Build.0 = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DLL-Import Debug|ARM.ActiveCfg = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DLL-Import Debug|ARM.Build.0 = Debug|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DLL-Import Debug|x64.ActiveCfg = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DLL-Import Debug|x64.Build.0 = Debug|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DLL-Import Debug|x86.ActiveCfg = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DLL-Import Debug|x86.Build.0 = Debug|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DLL-Import Release|ARM.ActiveCfg = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DLL-Import Release|ARM.Build.0 = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DLL-Import Release|x64.ActiveCfg = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DLL-Import Release|x64.Build.0 = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DLL-Import Release|x86.ActiveCfg = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.DLL-Import Release|x86.Build.0 = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release|ARM.ActiveCfg = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release|ARM.Build.0 = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release|x64.ActiveCfg = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release|x64.Build.0 = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release|x86.ActiveCfg = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release|x86.Build.0 = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseDLL|ARM.ActiveCfg = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseDLL|ARM.Build.0 = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Dll|ARM.ActiveCfg = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseDLL|x64.ActiveCfg = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseDLL|x64.Build.0 = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Dll|x64.ActiveCfg = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseDLL|x86.ActiveCfg = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseDLL|x86.Build.0 = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Dll|x86.ActiveCfg = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseDLLStaticDeps|ARM.ActiveCfg = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseDLLStaticDeps|ARM.Build.0 = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Dynamic|ARM.ActiveCfg = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Dynamic|ARM.Build.0 = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Dynamic|x64.ActiveCfg = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Dynamic|x64.Build.0 = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Dynamic|x86.ActiveCfg = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Dynamic|x86.Build.0 = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseLib|ARM.ActiveCfg = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseLib|ARM.Build.0 = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Lib|ARM.ActiveCfg = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseLib|x64.ActiveCfg = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseLib|x64.Build.0 = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Lib|x64.ActiveCfg = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseLib|x86.ActiveCfg = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseLib|x86.Build.0 = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Lib|x86.ActiveCfg = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseLTO|ARM.ActiveCfg = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseLTO|ARM.Build.0 = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseLTO|x64.ActiveCfg = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseLTO|x64.Build.0 = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseLTO|x86.ActiveCfg = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.ReleaseLTO|x86.Build.0 = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Static|ARM.ActiveCfg = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Static|ARM.Build.0 = Release|ARM

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Static|x64.ActiveCfg = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Static|x64.Build.0 = Release|x64

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Static|x86.ActiveCfg = Release|Win32

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD}.Release-Static|x86.Build.0 = Release|Win32

 		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.Debug|ARM.ActiveCfg = Debug-Dll|Win32

 		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.Debug|ARM.Build.0 = Debug-Dll|Win32

 		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.Debug|x64.ActiveCfg = Debug-Dll|Win32

@@ -5526,10 +5840,9 @@
 		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.ReleaseLib|ARM.ActiveCfg = Debug-Dll|Win32

 		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.ReleaseLib|ARM.Build.0 = Debug-Dll|Win32

 		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.Release-Lib|ARM.ActiveCfg = Release-Lib|Win32

-		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.ReleaseLib|x64.ActiveCfg = Release-Dll|x64

-		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.ReleaseLib|x64.Build.0 = Release-Dll|x64

-		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.Release-Lib|x64.ActiveCfg = Release-Lib|x64

-		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.Release-Lib|x64.Build.0 = Release-Lib|x64

+		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.ReleaseLib|x64.ActiveCfg = Release-Lib|x64

+		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.ReleaseLib|x64.Build.0 = Release-Lib|x64

+		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.Release-Lib|x64.ActiveCfg = Release-Lib|Win32

 		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.ReleaseLib|x86.ActiveCfg = Release-Lib|Win32

 		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.ReleaseLib|x86.Build.0 = Release-Lib|Win32

 		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.Release-Lib|x86.ActiveCfg = Release-Lib|Win32

@@ -5573,7 +5886,6 @@
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {B39BB8BB-3E02-42EB-B747-19ACB57B6BE6}

 		{B82CDD25-6903-430E-BD38-D8129A2015C1} = {B39BB8BB-3E02-42EB-B747-19ACB57B6BE6}

 		{B39BB8BB-3E02-42EB-B747-19ACB57B6BE6} = {96846C59-E0A1-4132-B779-065C2EAE3E51}

-		{0A18A071-125E-442F-AFF7-A3F68ABECF99} = {30AAB4B5-1D0C-4D51-A360-64FEAF6E6AE3}

 		{6227F51A-1498-4C4A-B213-F6FDED605125} = {27B9320A-DA7E-4849-BCB7-4DBA266499C8}

 		{27B9320A-DA7E-4849-BCB7-4DBA266499C8} = {96846C59-E0A1-4132-B779-065C2EAE3E51}

 		{805F73E9-495E-48F0-8C9A-7F050B524609} = {27B9320A-DA7E-4849-BCB7-4DBA266499C8}

@@ -5608,6 +5920,12 @@
 		{7D865A92-C575-44A3-9D83-EC3C9E97B0B0} = {821EC489-1C8E-4CE9-816B-7ACFEA492C34}

 		{E4CCBFE2-5DC2-44B2-92A8-447EFE6DDB6E} = {7D865A92-C575-44A3-9D83-EC3C9E97B0B0}

 		{1C2315EC-E08C-4E8F-AD66-917DC9C30B98} = {7D865A92-C575-44A3-9D83-EC3C9E97B0B0}

+		{23913386-5333-4C93-B3F0-0227AFF77B49} = {30AAB4B5-1D0C-4D51-A360-64FEAF6E6AE3}

+		{AAAB0FBB-A16E-4814-8918-0E25B278243B} = {96846C59-E0A1-4132-B779-065C2EAE3E51}

+		{EA0E0510-749F-47B2-9F53-565CB4893771} = {AAAB0FBB-A16E-4814-8918-0E25B278243B}

+		{A185856B-E055-4594-9268-57C897A81F90} = {96846C59-E0A1-4132-B779-065C2EAE3E51}

+		{039AC2C4-C1BE-4B3F-BC4A-4541B2066293} = {A185856B-E055-4594-9268-57C897A81F90}

+		{A02FD1CC-618B-428D-AC46-91A2A12D0DCD} = {A185856B-E055-4594-9268-57C897A81F90}

 		{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C} = {6EBA7EA6-20F5-40F9-96E3-32706D9ABD58}

 	EndGlobalSection

 EndGlobal


diff --git a/ring-client-uwp.vcxproj b/ring-client-uwp.vcxproj
index 7d523b4..c7ecd91 100644
--- a/ring-client-uwp.vcxproj
+++ b/ring-client-uwp.vcxproj

@@ -97,13 +97,13 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

-    <PackageCertificateKeyFile>ring-client-uwp_TemporaryKey.pfx</PackageCertificateKeyFile>

+    <PackageCertificateKeyFile>ring-client-uwp_StoreKey.pfx</PackageCertificateKeyFile>

     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>

     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>

     <AppxBundle>Always</AppxBundle>

     <AppxBundlePlatforms>x64</AppxBundlePlatforms>

-    <PackageCertificateThumbprint>13DE1E90818B523E210522CE40C78F2AD099C412</PackageCertificateThumbprint>

-    <AppxPackageDir>C:\Users\user\Desktop\</AppxPackageDir>

+    <PackageCertificateThumbprint>6E2CEF8A6A6A44314AB297CE41FC3BC8F2890973</PackageCertificateThumbprint>

+    <AppxPackageDir>C:\</AppxPackageDir>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">

     <ClCompile>

@@ -144,9 +144,10 @@
       <AdditionalIncludeDirectories>contrib\qrencode-win32;..\ring-daemon\MSVC;..\ring-daemon\src\media;..\ring-daemon\src;..\ring-daemon\src\dring;..\ring-daemon\contrib\include;..\ring-daemon\contrib\include\pjlib;..\ring-daemon\contrib\pjproject\third_party\speex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32_NATIVE;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WholeProgramOptimization>false</WholeProgramOptimization>

+      <CompileAsWinRT>true</CompileAsWinRT>

     </ClCompile>

     <Link>

-      <AdditionalLibraryDirectories>$(SolutionDir)..\ring-daemon\contrib\boost\stage\lib;$(SolutionDir)..\ring-daemon\contrib\lib\x64;$(SolutionDir)..\ring-daemon\MSVC\x64\ReleaseLib\bin;C:\msys64\home\user\ring-project\ring-project\ring-client-uwp\x64\Release-Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(SolutionDir)..\ring-daemon\contrib\boost\stage\lib;$(SolutionDir)..\ring-daemon\contrib\bin\x64;$(SolutionDir)..\ring-daemon\contrib\lib\x64;$(SolutionDir)..\ring-daemon\MSVC\x64\ReleaseLib\bin;$(SolutionDir)x64\Release-Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

     </Link>

     <ProjectReference>

       <LinkLibraryDependencies>false</LinkLibraryDependencies>

@@ -155,13 +156,14 @@
       <ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>

     </Link>

     <Link>

-      <AdditionalDependencies>winsqlite3.lib;shell32.lib;strmiids.lib;dring.lib;WindowsApp.lib;qrcodelib.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>shell32.lib;strmiids.lib;dring.lib;WindowsApp.lib;qrcodelib.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

     <Link>

       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

     </Link>

     <Link>

       <AdditionalOptions>/nodefaultlib:libcmt.lib /ignore:4006,4049,4099 %(AdditionalOptions)</AdditionalOptions>

+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

@@ -198,6 +200,7 @@
     </ClInclude>

     <ClInclude Include="SmartPanelItem.h" />

     <ClInclude Include="SmartPanelItemsViewModel.h" />

+    <ClInclude Include="UserModel.h" />

     <ClInclude Include="UserPreferences.h" />

     <ClInclude Include="Utils.h" />

     <ClInclude Include="Video.h" />

@@ -255,12 +258,7 @@
     <None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swscale-4.dll">

       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>

     </None>

-    <None Include="..\ring-daemon\contrib\redist\msvcr100.dll">

-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>

-    </None>

-    <None Include="..\ring-daemon\contrib\redist\pthreadVC2.dll">

-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>

-    </None>

+    <None Include="ring-client-uwp_StoreKey.pfx" />

     <None Include="ring-client-uwp_TemporaryKey.pfx" />

   </ItemGroup>

   <ItemGroup>

@@ -325,6 +323,7 @@
     </ClCompile>

     <ClCompile Include="SmartPanelItem.cpp" />

     <ClCompile Include="SmartPanelItemsViewModel.cpp" />

+    <ClCompile Include="UserModel.cpp" />

     <ClCompile Include="UserPreferences.cpp" />

     <ClCompile Include="Video.cpp" />

     <ClCompile Include="VideoCaptureManager.cpp" />

@@ -344,6 +343,9 @@
     <PRIResource Include="localization\Fr-fr\Resources.resw" />

     <PRIResource Include="localization\US-en\Resources.resw" />

   </ItemGroup>

+  <ItemGroup>

+    <None Include="Package.StoreAssociation.xml" />

+  </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>


diff --git a/ring-client-uwp.vcxproj.filters b/ring-client-uwp.vcxproj.filters
index 61b35fd..73bf3fc 100644
--- a/ring-client-uwp.vcxproj.filters
+++ b/ring-client-uwp.vcxproj.filters

@@ -1,102 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Common">

-      <UniqueIdentifier>e1354e5c-d116-4970-86d8-c5b0c0ca4591</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Assets">

-      <UniqueIdentifier>dcac1771-4f06-4a41-b772-3f502f0f39da</UniqueIdentifier>

-      <Extensions>bmp;fbx;gif;jpg;jpeg;tga;tiff;tif;png</Extensions>

-    </Filter>

-    <Filter Include="Views">

-      <UniqueIdentifier>{1d1ef61d-6e71-458f-9bb7-45441e9a94d0}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Assets\Dlls">

-      <UniqueIdentifier>{06835bd7-8bac-406a-8651-007b82da36ed}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Strings">

-      <UniqueIdentifier>{f6781cdb-0686-4a19-a1b8-3dc7df5efd56}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Strings\en-US">

-      <UniqueIdentifier>{70f7b244-b108-4bf1-8b6d-679a424b973f}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Strings\fr-Fr">

-      <UniqueIdentifier>{d42f40f3-a5fb-40d3-83b9-2c816189dc77}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Styles">

-      <UniqueIdentifier>{38929305-13e6-4beb-9e52-4020da29e403}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Assets\TESTS">

-      <UniqueIdentifier>{758258ab-8169-4388-a89d-a834cebce79a}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="ModelViews">

-      <UniqueIdentifier>{c9f1f5bd-c315-4f6f-a91b-bc67fe27e0b9}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Model">

-      <UniqueIdentifier>{8ea3251c-a70e-4de5-9f26-8db3df45c2c4}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Controls">

-      <UniqueIdentifier>{2cffcd5e-0546-4629-a152-37efd9c1128f}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Media">

-      <UniqueIdentifier>{bec54fb8-3a88-4687-8cbf-87325df1bcc7}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Media\Video">

-      <UniqueIdentifier>{f711ca0c-c71f-47a7-9352-441ab4b44d5d}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Media\Audio">

-      <UniqueIdentifier>{448e3594-0555-4c62-be25-71e1cebc80e1}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <ItemGroup>

     <ApplicationDefinition Include="App.xaml" />

   </ItemGroup>

   <ItemGroup>

+    <PRIResource Include="localization\US-en\Resources.resw">

+      <Filter>Strings\en-US</Filter>

+    </PRIResource>

+    <PRIResource Include="localization\Fr-fr\Resources.resw">

+      <Filter>Strings\fr-FR</Filter>

+    </PRIResource>

+  </ItemGroup>

+  <ItemGroup>

     <ClCompile Include="App.xaml.cpp" />

+    <ClCompile Include="LoadingPage.xaml.cpp" />

     <ClCompile Include="MainPage.xaml.cpp" />

+    <ClCompile Include="MessageTextPage.xaml.cpp" />

     <ClCompile Include="pch.cpp" />

-    <ClCompile Include="WelcomePage.xaml.cpp" />

-    <ClCompile Include="SmartPanel.xaml.cpp" />

     <ClCompile Include="RingConsolePanel.xaml.cpp" />

-    <ClCompile Include="Contact.cpp">

-      <Filter>Model</Filter>

-    </ClCompile>

-    <ClCompile Include="Account.cpp">

-      <Filter>Model</Filter>

-    </ClCompile>

-    <ClCompile Include="AccountsViewModel.cpp">

-      <Filter>ModelViews</Filter>

-    </ClCompile>

-    <ClCompile Include="ContactsViewModel.cpp">

-      <Filter>ModelViews</Filter>

+    <ClCompile Include="SmartPanel.xaml.cpp" />

+    <ClCompile Include="VideoPage.xaml.cpp" />

+    <ClCompile Include="WelcomePage.xaml.cpp" />

+    <ClCompile Include="Wizard.xaml.cpp" />

+    <ClCompile Include="RingD.cpp">

+      <Filter>Common</Filter>

     </ClCompile>

     <ClCompile Include="RingDebug.cpp">

       <Filter>Common</Filter>

     </ClCompile>

-    <ClCompile Include="MessageTextPage.xaml.cpp" />

-    <ClCompile Include="VideoPage.xaml.cpp" />

-    <ClCompile Include="RingD.cpp">

-      <Filter>Common</Filter>

-    </ClCompile>

-    <ClCompile Include="LoadingPage.xaml.cpp" />

-    <ClCompile Include="Wizard.xaml.cpp" />

-    <ClCompile Include="Conversation.cpp">

-      <Filter>Model</Filter>

-    </ClCompile>

     <ClCompile Include="UserPreferences.cpp">

       <Filter>Common</Filter>

     </ClCompile>

-    <ClCompile Include="SmartPanelItem.cpp">

+    <ClCompile Include="AccountListItem.cpp">

       <Filter>Controls</Filter>

     </ClCompile>

-    <ClCompile Include="SmartPanelItemsViewModel.cpp">

-      <Filter>ModelViews</Filter>

-    </ClCompile>

-    <ClCompile Include="VideoManager.cpp">

-      <Filter>Media\Video</Filter>

-    </ClCompile>

-    <ClCompile Include="VideoRendererManager.cpp">

-      <Filter>Media\Video</Filter>

+    <ClCompile Include="SmartPanelItem.cpp">

+      <Filter>Controls</Filter>

     </ClCompile>

     <ClCompile Include="Video.cpp">

       <Filter>Media\Video</Filter>

@@ -104,56 +43,71 @@
     <ClCompile Include="VideoCaptureManager.cpp">

       <Filter>Media\Video</Filter>

     </ClCompile>

-    <ClCompile Include="AccountListItem.cpp">

-      <Filter>Controls</Filter>

+    <ClCompile Include="VideoManager.cpp">

+      <Filter>Media\Video</Filter>

+    </ClCompile>

+    <ClCompile Include="VideoRendererManager.cpp">

+      <Filter>Media\Video</Filter>

+    </ClCompile>

+    <ClCompile Include="Account.cpp">

+      <Filter>Model</Filter>

+    </ClCompile>

+    <ClCompile Include="Contact.cpp">

+      <Filter>Model</Filter>

+    </ClCompile>

+    <ClCompile Include="Conversation.cpp">

+      <Filter>Model</Filter>

     </ClCompile>

     <ClCompile Include="AccountListItemsViewModel.cpp">

       <Filter>ModelViews</Filter>

     </ClCompile>

+    <ClCompile Include="AccountsViewModel.cpp">

+      <Filter>ModelViews</Filter>

+    </ClCompile>

+    <ClCompile Include="ContactsViewModel.cpp">

+      <Filter>ModelViews</Filter>

+    </ClCompile>

+    <ClCompile Include="SmartPanelItemsViewModel.cpp">

+      <Filter>ModelViews</Filter>

+    </ClCompile>

+    <ClCompile Include="UserModel.cpp">

+      <Filter>Model</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

+    <ClInclude Include="LoadingPage.xaml.h" />

+    <ClInclude Include="MessageTextPage.xaml.h" />

     <ClInclude Include="pch.h" />

     <ClInclude Include="App.xaml.h" />

     <ClInclude Include="MainPage.xaml.h" />

-    <ClInclude Include="WelcomePage.xaml.h" />

-    <ClInclude Include="SmartPanel.xaml.h" />

     <ClInclude Include="RingConsolePanel.xaml.h" />

-    <ClInclude Include="Contact.h">

-      <Filter>Model</Filter>

+    <ClInclude Include="SmartPanel.xaml.h" />

+    <ClInclude Include="VideoPage.xaml.h" />

+    <ClInclude Include="WelcomePage.xaml.h" />

+    <ClInclude Include="Wizard.xaml.h" />

+    <ClInclude Include="Globals.h">

+      <Filter>Common</Filter>

     </ClInclude>

-    <ClInclude Include="Account.h">

-      <Filter>Model</Filter>

-    </ClInclude>

-    <ClInclude Include="AccountsViewModel.h">

-      <Filter>ModelViews</Filter>

-    </ClInclude>

-    <ClInclude Include="ContactsViewModel.h">

-      <Filter>ModelViews</Filter>

+    <ClInclude Include="RingD.h">

+      <Filter>Common</Filter>

     </ClInclude>

     <ClInclude Include="RingDebug.h">

       <Filter>Common</Filter>

     </ClInclude>

+    <ClInclude Include="UserPreferences.h">

+      <Filter>Common</Filter>

+    </ClInclude>

     <ClInclude Include="Utils.h">

       <Filter>Common</Filter>

     </ClInclude>

-    <ClInclude Include="MessageTextPage.xaml.h" />

-    <ClInclude Include="VideoPage.xaml.h" />

-    <ClInclude Include="RingD.h">

-      <Filter>Common</Filter>

-    </ClInclude>

-    <ClInclude Include="LoadingPage.xaml.h" />

-    <ClInclude Include="Wizard.xaml.h" />

-    <ClInclude Include="Conversation.h">

-      <Filter>Model</Filter>

-    </ClInclude>

-    <ClInclude Include="UserPreferences.h">

-      <Filter>Common</Filter>

+    <ClInclude Include="AccountListItem.h">

+      <Filter>Controls</Filter>

     </ClInclude>

     <ClInclude Include="SmartPanelItem.h">

       <Filter>Controls</Filter>

     </ClInclude>

-    <ClInclude Include="SmartPanelItemsViewModel.h">

-      <Filter>ModelViews</Filter>

+    <ClInclude Include="Video.h">

+      <Filter>Media\Video</Filter>

     </ClInclude>

     <ClInclude Include="VideoCaptureManager.h">

       <Filter>Media\Video</Filter>

@@ -164,50 +118,44 @@
     <ClInclude Include="VideoRendererManager.h">

       <Filter>Media\Video</Filter>

     </ClInclude>

-    <ClInclude Include="Video.h">

-      <Filter>Media\Video</Filter>

+    <ClInclude Include="Account.h">

+      <Filter>Model</Filter>

     </ClInclude>

-    <ClInclude Include="Globals.h">

-      <Filter>Common</Filter>

+    <ClInclude Include="Contact.h">

+      <Filter>Model</Filter>

     </ClInclude>

-    <ClInclude Include="AccountListItem.h">

-      <Filter>Controls</Filter>

+    <ClInclude Include="Conversation.h">

+      <Filter>Model</Filter>

     </ClInclude>

     <ClInclude Include="AccountListItemsViewModel.h">

       <Filter>ModelViews</Filter>

     </ClInclude>

+    <ClInclude Include="AccountsViewModel.h">

+      <Filter>ModelViews</Filter>

+    </ClInclude>

+    <ClInclude Include="ContactsViewModel.h">

+      <Filter>ModelViews</Filter>

+    </ClInclude>

+    <ClInclude Include="SmartPanelItemsViewModel.h">

+      <Filter>ModelViews</Filter>

+    </ClInclude>

+    <ClInclude Include="UserModel.h">

+      <Filter>Model</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <Image Include="Assets\LockScreenLogo.scale-200.png">

-      <Filter>Assets</Filter>

-    </Image>

-    <Image Include="Assets\SplashScreen.scale-200.png">

-      <Filter>Assets</Filter>

-    </Image>

-    <Image Include="Assets\Square150x150Logo.scale-200.png">

-      <Filter>Assets</Filter>

-    </Image>

-    <Image Include="Assets\Square44x44Logo.scale-200.png">

-      <Filter>Assets</Filter>

-    </Image>

-    <Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png">

-      <Filter>Assets</Filter>

-    </Image>

-    <Image Include="Assets\StoreLogo.png">

-      <Filter>Assets</Filter>

-    </Image>

-    <Image Include="Assets\Wide310x150Logo.scale-200.png">

-      <Filter>Assets</Filter>

-    </Image>

-    <Image Include="Assets\TESTS\contactAvatar.png">

+    <Image Include="Assets\AccountTypeRING.png">

       <Filter>Assets\TESTS</Filter>

     </Image>

-    <Image Include="Assets\TESTS\qrcode.png">

+    <Image Include="Assets\AccountTypeSIP.png">

       <Filter>Assets\TESTS</Filter>

     </Image>

     <Image Include="Assets\TESTS\blank.png">

       <Filter>Assets\TESTS</Filter>

     </Image>

+    <Image Include="Assets\TESTS\contactAvatar.png">

+      <Filter>Assets\TESTS</Filter>

+    </Image>

     <Image Include="Assets\TESTS\logo-ring.scale-100.png">

       <Filter>Assets\TESTS</Filter>

     </Image>

@@ -226,21 +174,41 @@
     <Image Include="Assets\TESTS\logo-ring.square-100.png">

       <Filter>Assets\TESTS</Filter>

     </Image>

-    <Image Include="Assets\qrCodeIcon.png">

+    <Image Include="Assets\TESTS\qrcode.png">

+      <Filter>Assets\TESTS</Filter>

+    </Image>

+    <Image Include="Assets\LockScreenLogo.scale-200.png">

       <Filter>Assets</Filter>

     </Image>

-    <Image Include="Assets\AccountTypeSIP.png">

-      <Filter>Assets\TESTS</Filter>

+    <Image Include="Assets\SplashScreen.scale-200.png">

+      <Filter>Assets</Filter>

     </Image>

-    <Image Include="Assets\AccountTypeRING.png">

-      <Filter>Assets\TESTS</Filter>

+    <Image Include="Assets\Square44x44Logo.scale-200.png">

+      <Filter>Assets</Filter>

+    </Image>

+    <Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png">

+      <Filter>Assets</Filter>

+    </Image>

+    <Image Include="Assets\Square150x150Logo.scale-200.png">

+      <Filter>Assets</Filter>

+    </Image>

+    <Image Include="Assets\StoreLogo.png">

+      <Filter>Assets</Filter>

+    </Image>

+    <Image Include="Assets\Wide310x150Logo.scale-200.png">

+      <Filter>Assets</Filter>

+    </Image>

+    <Image Include="Assets\qrCodeIcon.png">

+      <Filter>Assets</Filter>

     </Image>

   </ItemGroup>

   <ItemGroup>

     <AppxManifest Include="Package.appxmanifest" />

   </ItemGroup>

   <ItemGroup>

+    <None Include="ring-client-uwp_StoreKey.pfx" />

     <None Include="ring-client-uwp_TemporaryKey.pfx" />

+    <None Include="Package.StoreAssociation.xml" />

     <None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avcodec-57.dll">

       <Filter>Assets\Dlls</Filter>

     </None>

@@ -256,31 +224,26 @@
     <None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\avutil-55.dll">

       <Filter>Assets\Dlls</Filter>

     </None>

-    <None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swresample-2.dll">

-      <Filter>Assets\Dlls</Filter>

-    </None>

     <None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swscale-4.dll">

       <Filter>Assets\Dlls</Filter>

     </None>

-    <None Include="..\ring-daemon\contrib\redist\msvcr100.dll">

-      <Filter>Assets\Dlls</Filter>

-    </None>

-    <None Include="..\ring-daemon\contrib\redist\pthreadVC2.dll">

+    <None Include="..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swresample-2.dll">

       <Filter>Assets\Dlls</Filter>

     </None>

   </ItemGroup>

   <ItemGroup>

     <Page Include="MainPage.xaml" />

-    <Page Include="WelcomePage.xaml">

-      <Filter>Views</Filter>

-    </Page>

+    <Page Include="Wizard.xaml" />

     <Page Include="Styles.xaml">

       <Filter>Styles</Filter>

     </Page>

-    <Page Include="RingConsolePanel.xaml">

+    <Page Include="LoadingPage.xaml">

       <Filter>Views</Filter>

     </Page>

-    <Page Include="SmartPanel.xaml">

+    <Page Include="MessageTextPage.xaml">

+      <Filter>Views</Filter>

+    </Page>

+    <Page Include="RingConsolePanel.xaml">

       <Filter>Views</Filter>

     </Page>

     <Page Include="SmartPanel.xaml">

@@ -289,20 +252,55 @@
     <Page Include="VideoPage.xaml">

       <Filter>Views</Filter>

     </Page>

-    <Page Include="MessageTextPage.xaml">

+    <Page Include="WelcomePage.xaml">

       <Filter>Views</Filter>

     </Page>

-    <Page Include="LoadingPage.xaml">

-      <Filter>Views</Filter>

-    </Page>

-    <Page Include="Wizard.xaml" />

   </ItemGroup>

   <ItemGroup>

-    <PRIResource Include="localization\US-en\Resources.resw">

-      <Filter>Strings\en-US</Filter>

-    </PRIResource>

-    <PRIResource Include="localization\Fr-fr\Resources.resw">

-      <Filter>Strings\fr-Fr</Filter>

-    </PRIResource>

+    <Filter Include="Assets">

+      <UniqueIdentifier>{c8c09e1f-904b-4121-bf45-ccee3d7dcd7f}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Assets\Dlls">

+      <UniqueIdentifier>{5cfe090d-7521-4f12-adaf-dd47afd8fa58}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Assets\TESTS">

+      <UniqueIdentifier>{41024596-5974-4b5d-b9ce-970c3746ac80}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Common">

+      <UniqueIdentifier>{98b4d31d-b4eb-44ec-ab04-2b98816714b8}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Controls">

+      <UniqueIdentifier>{befd33e5-463a-42bb-9b9b-68c1ab49f0df}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Media">

+      <UniqueIdentifier>{b4690532-30e8-4640-8478-1a686d31d7a5}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Media\Audio">

+      <UniqueIdentifier>{851d9f4a-c6b8-40aa-ba0f-44a7185795e2}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Media\Video">

+      <UniqueIdentifier>{6d47b8c1-b056-4461-98d6-5bcb52d30447}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Model">

+      <UniqueIdentifier>{04b389af-ccff-45ed-b44a-645c39388eec}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="ModelViews">

+      <UniqueIdentifier>{259b6ba4-1943-4393-b7a1-5e83f15a0217}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Strings">

+      <UniqueIdentifier>{f9db2a3e-6f39-4c23-922e-7143eb98197b}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Strings\en-US">

+      <UniqueIdentifier>{a710d34d-6f6b-4a72-a62b-3d0bb132533b}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Strings\fr-FR">

+      <UniqueIdentifier>{e97f4433-16c6-425e-b476-f2e3877d4104}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Styles">

+      <UniqueIdentifier>{88bf5748-d567-486c-91cf-1c7a124078d3}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Views">

+      <UniqueIdentifier>{b81596e4-e16c-4537-9631-65655360cbf4}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

 </Project>
\ No newline at end of file
commit	49f1b578d72039540f6d18c24611b89d98ff5344	[log] [tgz]
author	atraczyk <andreastraczyk@gmail.com>	Thu Oct 27 12:33:28 2016 -0400
committer	Nicolas Jager <nicolas.jager@savoirfairelinux.com>	Tue Nov 08 12:54:25 2016 -0400
tree	b4f3844443769349ee4e55326aa5b7fa1b76f115
parent	bd8238046f1fd861dc0ffed125ea30d2aa9f51bf [diff]