From 471ea5e37a49e9ae75a7dc69ffe57d3ab5fffd0d Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Wed, 21 Sep 2016 04:02:40 +0200
Subject: [PATCH] WIP

---
 BookAStar/BookAStar.Droid/Assets/test.html    |  71 ++++++++++
 .../BookAStar.Droid/BookAStar.Droid.csproj    |   8 +-
 BookAStar/BookAStar.Droid/MainActivity.cs     |  43 ++-----
 BookAStar/BookAStar.Droid/MarkdownEditor.cs   |  68 +++-------
 .../BookAStar.Droid/MarkdownEditor.cshtml     |  43 +++----
 .../BookAStar.Droid/MarkdownViewRenderer.cs   |  94 ++++++++++++++
 .../BookAStar.Droid/MarkdownWebViewClient.cs  |   6 +-
 .../Properties/AssemblyInfo.cs                |   2 +-
 .../Resources/Resource.Designer.cs            |  43 ++++---
 .../Resources/drawable/Icon-anon-48px.png     | Bin 0 -> 1700 bytes
 .../Resources/drawable/Icon-anon-64px.png     | Bin 0 -> 2426 bytes
 .../Resources/drawable/Icon-anon-73px.png     | Bin 0 -> 2516 bytes
 .../Resources/drawable/Icon-anon-org.png      | Bin 0 -> 2719 bytes
 .../Resources/drawable/icon-anon.png          | Bin 0 -> 1031 bytes
 .../Resources/layout/EditEstimate.axml        |   5 +
 BookAStar/BookAStar/App.xaml                  |  18 ++-
 BookAStar/BookAStar/App.xaml.cs               | 121 +++++++++---------
 BookAStar/BookAStar/BookAStar.csproj          |  26 ++--
 BookAStar/BookAStar/Constants.cs              |  34 ++++-
 .../BookAStar/Helpers/AvatarImageSource.cs    |  28 ++++
 .../BookAStar/{ => Helpers}/DataManager.cs    |  11 +-
 BookAStar/BookAStar/Helpers/MainSettings.cs   |   6 -
 BookAStar/BookAStar/Helpers/RemoteEntity.cs   |  95 ++++++++------
 BookAStar/BookAStar/Helpers/RemoteEntityRO.cs |   4 +-
 BookAStar/BookAStar/Interfaces/IMDEditor.cs   |  13 ++
 .../BookAStar/{ => Interfaces}/IPlatform.cs   |   5 +-
 BookAStar/BookAStar/Model/BookQueryData.cs    |   6 -
 .../BookAStar/Model/ClientProviderInfo.cs     |  23 ++++
 BookAStar/BookAStar/Model/Manager.cs          |   9 +-
 BookAStar/BookAStar/Model/Social/Location.cs  |  12 +-
 .../BookAStar/Model/Workflow/Estimate.cs      |  32 ++++-
 BookAStar/BookAStar/Pages/BlogPage.cs         |   2 +-
 .../BookAStar/Pages/BookQueriesPage.xaml      |  66 ++++++----
 .../BookAStar/Pages/BookQueriesPage.xaml.cs   |   8 +-
 BookAStar/BookAStar/Pages/BookQueryPage.xaml  |  40 ++++--
 .../BookAStar/Pages/BookQueryPage.xaml.cs     |  18 ++-
 .../BookAStar/Pages/EditEstimatePage.xaml     |  42 ++++++
 .../BookAStar/Pages/EditEstimatePage.xaml.cs  |  44 +++++++
 BookAStar/BookAStar/Pages/EventDetail.xaml.cs |   2 +-
 .../BookAStar/Pages/MakeAnEstimatePage.xaml   |  10 --
 .../Pages/MakeAnEstimatePage.xaml.cs          |  28 ----
 BookAStar/BookAStar/Pages/QueriesPage.xaml    |   6 -
 BookAStar/BookAStar/Pages/QueriesPage.xaml.cs |  18 ---
 BookAStar/BookAStar/Pages/SearchPage.xaml     |   6 +-
 BookAStar/BookAStar/Pages/SettingsPage.xaml   |  16 ++-
 .../BookAStar/Pages/SettingsPage.xaml.cs      |  12 +-
 .../BookAStar/Properties/AssemblyInfo.cs      |   6 +-
 BookAStar/BookAStar/Views/MarkdownView.cs     |  36 +++---
 BookAStar/BookAStar/icon-anon.png             | Bin 0 -> 1031 bytes
 49 files changed, 742 insertions(+), 444 deletions(-)
 create mode 100644 BookAStar/BookAStar.Droid/Assets/test.html
 create mode 100644 BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
 create mode 100644 BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-48px.png
 create mode 100644 BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-64px.png
 create mode 100644 BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-73px.png
 create mode 100644 BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-org.png
 create mode 100644 BookAStar/BookAStar.Droid/Resources/drawable/icon-anon.png
 create mode 100644 BookAStar/BookAStar.Droid/Resources/layout/EditEstimate.axml
 create mode 100644 BookAStar/BookAStar/Helpers/AvatarImageSource.cs
 rename BookAStar/BookAStar/{ => Helpers}/DataManager.cs (74%)
 create mode 100644 BookAStar/BookAStar/Interfaces/IMDEditor.cs
 rename BookAStar/BookAStar/{ => Interfaces}/IPlatform.cs (85%)
 create mode 100644 BookAStar/BookAStar/Model/ClientProviderInfo.cs
 create mode 100644 BookAStar/BookAStar/Pages/EditEstimatePage.xaml
 create mode 100644 BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
 delete mode 100644 BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml
 delete mode 100644 BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml.cs
 delete mode 100644 BookAStar/BookAStar/Pages/QueriesPage.xaml
 delete mode 100644 BookAStar/BookAStar/Pages/QueriesPage.xaml.cs
 create mode 100644 BookAStar/BookAStar/icon-anon.png

diff --git a/BookAStar/BookAStar.Droid/Assets/test.html b/BookAStar/BookAStar.Droid/Assets/test.html
new file mode 100644
index 00000000..1a5fbf10
--- /dev/null
+++ b/BookAStar/BookAStar.Droid/Assets/test.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <link rel="stylesheet" href="quill.snow.css" />
+    <style>
+        .standalone-container {
+            margin: 0;
+            width: 100%;
+            height: 100%;
+        }
+        #bubble-container {
+            width:100%;
+           height: 100%;
+        }
+        #bubble-container div.ql-editor {
+            margin-top:0;
+        }
+        .hidden {
+            display: none;
+        }
+    </style>
+
+</head>
+<body>
+    <h1>Title</h1>
+    <div class="standalone-container">
+        <div id="bubble-container"><h1><strong>Hello Estimate!</strong></h1>
+</div>
+    </div>
+    
+    <script type="text/javascript" src="quill.min.js"></script>
+    <script type="text/javascript" src="jquery.js"></script>
+    <script type="text/javascript" src="showdown.js"></script>
+    <script type="text/javascript" src="to-markdown.js"></script>
+    <script type="text/javascript" src="md-helpers.js"></script>
+
+    <script type="text/javascript">
+        var toolbarOptions = [
+  ['bold', 'italic', 'underline', 'strike'],        // toggled buttons
+  ['blockquote', 'code-block'],
+
+  [{ 'header': 1 }, { 'header': 2 }],               // custom button values
+  [{ 'list': 'ordered' }, { 'list': 'bullet' }],
+  [{ 'indent': '-1' }, { 'indent': '+1' }],          // outdent/indent
+  
+  ['clean']                                         // remove formatting button
+        ];
+
+        var quill = new Quill('#bubble-container', {
+            modules: {
+                toolbar: toolbarOptions
+            },
+            placeholder: 'Composez votre texte ...',
+            theme: 'snow'
+        });
+
+      function getMD() {
+          return markdownize($('#bubble-container div.ql-editor').html())
+      }
+      quill.on('text-change', function (delta, oldDelta, source)
+      {
+          if (source === "user") {
+              $.get("file:validate?md=" + encodeURIComponent(getMD()));
+          }
+      });
+    </script>
+
+</body>
+</html>
+
diff --git a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
index e2410b5b..c7b024ce 100644
--- a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
+++ b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
@@ -88,7 +88,8 @@
       <HintPath>..\..\packages\Xam.Plugin.Media.1.0.1\lib\MonoAndroid10\Media.Plugin.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Mono.Android" />
+    <Reference Include="Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL" />
+    <Reference Include="Mono.Android.Export, Version=1.0.6099.33544, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL" />
     <Reference Include="Mono.Data.Sqlite" />
     <Reference Include="mscorlib" />
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -203,6 +204,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>MarkdownEditor.cshtml</DependentUpon>
     </Compile>
+    <Compile Include="MarkdownViewRenderer.cs" />
     <Compile Include="MarkdownWebViewClient.cs" />
     <Compile Include="OAuth2\YaOAuth2Authenticator.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
@@ -224,6 +226,9 @@
     <None Include="packages.config" />
     <None Include="Resources\AboutResources.txt" />
     <AndroidAsset Include="Assets\AboutAssets.txt" />
+    <AndroidResource Include="Resources\layout\EditEstimate.axml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\icon.png" />
@@ -301,6 +306,7 @@
     <AndroidResource Include="Resources\drawable\nfqrcode.png" />
     <AndroidResource Include="Resources\drawable\visuel_sexion.jpg" />
     <AndroidResource Include="Resources\values\values-21\styles.xml" />
+    <AndroidResource Include="Resources\drawable\icon-anon.png" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\drawable-hdpi\" />
diff --git a/BookAStar/BookAStar.Droid/MainActivity.cs b/BookAStar/BookAStar.Droid/MainActivity.cs
index 11e58483..d1dd5105 100644
--- a/BookAStar/BookAStar.Droid/MainActivity.cs
+++ b/BookAStar/BookAStar.Droid/MainActivity.cs
@@ -27,7 +27,8 @@ using Android.Webkit;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 using Android.Views;
-
+using BookAStar.Helpers;
+using BookAStar.Interfaces;
 
 namespace BookAStar.Droid
 {
@@ -87,11 +88,11 @@ namespace BookAStar.Droid
         {
 
             var accStore = AccountStore.Create(this);
-            var accounts = accStore.FindAccountsForService(MainSettings.ApplicationName);
+            var accounts = accStore.FindAccountsForService(Constants.ApplicationName);
 
             accStore.Delete(
                     accounts.Where(a => a.Username == userName).FirstOrDefault()
-                    , MainSettings.ApplicationName);
+                    , Constants.ApplicationName);
             Toast.MakeText(this,
                 Resource.String.yavscIdentRemoved
                 , ToastLength.Short);
@@ -160,7 +161,7 @@ namespace BookAStar.Droid
                     using (var reader = new StreamReader(response.GetResponseStream()))
                     {
                         responseText = reader.ReadToEnd();
-                        Log.Debug(MainSettings.ApplicationName, responseText);
+                        Log.Debug(Constants.ApplicationName, responseText);
                     }
                 }
             }
@@ -180,7 +181,7 @@ namespace BookAStar.Droid
         {
             return await Task.Run(() => {
                 var manager = AccountStore.Create(this);
-                return manager.FindAccountsForService(MainSettings.ApplicationName);
+                return manager.FindAccountsForService(Constants.ApplicationName);
             });
         }
         YaOAuth2Authenticator auth = new YaOAuth2Authenticator(
@@ -215,7 +216,7 @@ namespace BookAStar.Droid
 
                                // get me
                                // var request = new OAuth2Request("GET", new Uri(Constants.UserInfoUrl), null, eventArgs.Account);
-                               var request = new HttpRequestMessage(HttpMethod.Get, MainSettings.UserInfoUrl);
+                               var request = new HttpRequestMessage(HttpMethod.Get, Constants.UserInfoUrl);
 
                                request.Headers.Authorization =
                                new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", tokens.AccessToken);
@@ -244,7 +245,7 @@ namespace BookAStar.Droid
                                };
                                
                                MainSettings.SaveUser(newuser);
-                               accStore.Save(acc, MainSettings.ApplicationName);
+                               accStore.Save(acc, Constants.ApplicationName);
                            }
                        }
 
@@ -331,34 +332,6 @@ namespace BookAStar.Droid
                 return m.InvokeJson(arg);
             }
         }
-
-        public Xamarin.Forms.View CreateMarkdownView(string markdown, Action<string> update)
-        {
-            var view = new Android.Webkit.WebView(Forms.Context);
-            var viewclient = new MarkdownWebViewClient(update);
-            view.SetWebViewClient(viewclient);
-            var mde = new MarkdownEditor();
-            if (markdown!=null)
-            {
-                var md = new MarkdownDeep.Markdown();
-                mde.Model = md.Transform(markdown);
-            }
-            var html = mde.GenerateString();
-            view.Settings.BuiltInZoomControls = true;
-            view.Settings.JavaScriptEnabled = true;
-            view.Settings.LoadsImagesAutomatically = true;
-            view.Settings.SetAppCacheEnabled(true);
-            view.Settings.AllowContentAccess = true;
-            view.Settings.AllowFileAccess = true;
-            view.Settings.AllowFileAccessFromFileURLs = true;
-            view.Settings.AllowUniversalAccessFromFileURLs = true;
-            view.Settings.BlockNetworkImage = false;
-            view.Settings.BlockNetworkLoads = false;
-            view.LoadDataWithBaseURL("file:///android_asset/",
-                html, "text/html", "utf-8",null);
-            
-            return view.ToView();
-        }
         
     }
 }
diff --git a/BookAStar/BookAStar.Droid/MarkdownEditor.cs b/BookAStar/BookAStar.Droid/MarkdownEditor.cs
index 24f34298..854ebed9 100644
--- a/BookAStar/BookAStar.Droid/MarkdownEditor.cs
+++ b/BookAStar/BookAStar.Droid/MarkdownEditor.cs
@@ -17,7 +17,7 @@ using System.Linq;
 using System.Text;
 
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorTemplatePreprocessor", "4.1.2.18")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("RazorTemplatePreprocessor", "4.2.0.680")]
 public partial class MarkdownEditor : MarkdownEditorBase
 {
 
@@ -32,32 +32,30 @@ public string Model { get; set; }
 
 public override void Execute()
 {
-WriteLiteral("<!DOCTYPE html>\r\n<html>\r\n<head>\r\n   \r\n    <meta");
+WriteLiteral("<!DOCTYPE html>\r\n<html>\r\n<head>\r\n    <meta");
 
 WriteLiteral(" charset=\"utf-8\"");
 
-WriteLiteral(">\r\n\r\n    <link");
+WriteLiteral(">\r\n    <link");
 
 WriteLiteral(" rel=\"stylesheet\"");
 
 WriteLiteral(" href=\"quill.snow.css\"");
 
 WriteLiteral(@" />
-
     <style>
         .standalone-container {
             margin: 0;
             width: 100%;
+            height: 100%;
         }
-
         #bubble-container {
+            width:100%;
            height: 100%;
         }
-
         #bubble-container div.ql-editor {
             margin-top:3em;
         }
-
         .hidden {
             display: none;
         }
@@ -65,7 +63,6 @@ WriteLiteral(@" />
 
 </head>
 <body>
-
     <div");
 
 WriteLiteral(" class=\"standalone-container\"");
@@ -77,31 +74,13 @@ WriteLiteral(" id=\"bubble-container\"");
 WriteLiteral(">");
 
 
-#line 33 "MarkdownEditor.cshtml"
+#line 28 "MarkdownEditor.cshtml"
                               Write(Html.Write(Model));
 
 
 #line default
 #line hidden
-WriteLiteral("</div>\r\n    </div>\r\n    <form><input");
-
-WriteLiteral(" type=\"hidden\"");
-
-WriteLiteral(" name=\"md\"");
-
-WriteLiteral(" id=\"md\"");
-
-WriteLiteral(" />\r\n    <input");
-
-WriteLiteral(" id=\"btnSubmit\"");
-
-WriteLiteral(" type=\"button\"");
-
-WriteLiteral(" value=\"Valider\"");
-
-WriteLiteral(" class=\"hidden\"");
-
-WriteLiteral(" /></form>\r\n    <script");
+WriteLiteral("</div>\r\n    </div>\r\n    \r\n    <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -143,7 +122,7 @@ WriteLiteral(@">
   [{ 'header': 1 }, { 'header': 2 }],               // custom button values
   [{ 'list': 'ordered' }, { 'list': 'bullet' }],
   [{ 'indent': '-1' }, { 'indent': '+1' }],          // outdent/indent
-  
+  ['link', 'image'],
   ['clean']                                         // remove formatting button
         ];
 
@@ -151,26 +130,19 @@ WriteLiteral(@">
             modules: {
                 toolbar: toolbarOptions
             },
-    placeholder: 'Composez votre texte ...',
-    theme: 'snow'
-  });
-
-  function getMD() {
-      return markdownize($('#bubble-container div.ql-editor').html())
-  }
-  quill.on('text-change', function (delta, oldDelta, source)
-  {
-      if (source === ""user"") {
-          $('#md').val(getMD());
-          $('#btnSubmit').removeClass('hidden');
+            placeholder: 'Composez votre texte ...',
+            theme: 'snow'
+        });
+
+      function getMD() {
+          return markdownize($('#bubble-container div.ql-editor').html())
       }
-  });
-  $(document).ready(function () {
-      $('#btnSubmit').on('click', function () {
-          $.get(""file:validate?md="" + encodeURIComponent(getMD()),
-       function (data, stat, jqXHR) { $('#result').html(""Okay"") })
-      })
-  });
+      quill.on('text-change', function (delta, oldDelta, source)
+      {
+          if (source === ""user"") {
+              invokeCSharpAction(getMD());
+          }
+      });
     </script>
 
 </body>
diff --git a/BookAStar/BookAStar.Droid/MarkdownEditor.cshtml b/BookAStar/BookAStar.Droid/MarkdownEditor.cshtml
index 95c8e56e..1b9ccc99 100644
--- a/BookAStar/BookAStar.Droid/MarkdownEditor.cshtml
+++ b/BookAStar/BookAStar.Droid/MarkdownEditor.cshtml
@@ -2,25 +2,21 @@
 <!DOCTYPE html>
 <html>
 <head>
-   
     <meta charset="utf-8">
-
     <link rel="stylesheet" href="quill.snow.css" />
-
     <style>
         .standalone-container {
             margin: 0;
             width: 100%;
+            height: 100%;
         }
-
         #bubble-container {
+            width:100%;
            height: 100%;
         }
-
         #bubble-container div.ql-editor {
             margin-top:3em;
         }
-
         .hidden {
             display: none;
         }
@@ -28,12 +24,10 @@
 
 </head>
 <body>
-
     <div class="standalone-container">
         <div id="bubble-container">@Html.Write(Model)</div>
     </div>
-    <form><input type="hidden" name="md" id="md" />
-    <input id="btnSubmit" type="button" value="Valider" class="hidden" /></form>
+    
     <script type="text/javascript" src="quill.min.js"></script>
     <script type="text/javascript" src="jquery.js"></script>
     <script type="text/javascript" src="showdown.js"></script>
@@ -48,7 +42,7 @@
   [{ 'header': 1 }, { 'header': 2 }],               // custom button values
   [{ 'list': 'ordered' }, { 'list': 'bullet' }],
   [{ 'indent': '-1' }, { 'indent': '+1' }],          // outdent/indent
-  
+  ['link', 'image'],
   ['clean']                                         // remove formatting button
         ];
 
@@ -56,26 +50,19 @@
             modules: {
                 toolbar: toolbarOptions
             },
-    placeholder: 'Composez votre texte ...',
-    theme: 'snow'
-  });
+            placeholder: 'Composez votre texte ...',
+            theme: 'snow'
+        });
 
-  function getMD() {
-      return markdownize($('#bubble-container div.ql-editor').html())
-  }
-  quill.on('text-change', function (delta, oldDelta, source)
-  {
-      if (source === "user") {
-          $('#md').val(getMD());
-          $('#btnSubmit').removeClass('hidden');
+      function getMD() {
+          return markdownize($('#bubble-container div.ql-editor').html())
       }
-  });
-  $(document).ready(function () {
-      $('#btnSubmit').on('click', function () {
-          $.get("file:validate?md=" + encodeURIComponent(getMD()),
-       function (data, stat, jqXHR) { $('#result').html("Okay") })
-      })
-  });
+      quill.on('text-change', function (delta, oldDelta, source)
+      {
+          if (source === "user") {
+              invokeCSharpAction(getMD());
+          }
+      });
     </script>
 
 </body>
diff --git a/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs b/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
new file mode 100644
index 00000000..b315bade
--- /dev/null
+++ b/BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
@@ -0,0 +1,94 @@
+
+using BookAStar.Views;
+using Android.Webkit;
+using Xamarin.Forms.Platform.Android;
+using BookAStar.Droid;
+using System;
+using Java.Interop;
+
+[assembly: Xamarin.Forms.ExportRenderer(typeof(MarkdownView), typeof(MarkdownViewRenderer))]
+namespace BookAStar.Droid
+{
+    public class JSBridge : Java.Lang.Object
+    {
+        readonly WeakReference<MarkdownViewRenderer> hybridWebViewRenderer;
+
+        public JSBridge(MarkdownViewRenderer hybridRenderer)
+        {
+            hybridWebViewRenderer = new WeakReference<MarkdownViewRenderer>(hybridRenderer);
+        }
+
+        [JavascriptInterface]
+        [Export("invokeAction")]
+        public void InvokeAction(string data)
+        {
+            MarkdownViewRenderer hybridRenderer;
+
+            if (hybridWebViewRenderer != null && hybridWebViewRenderer.TryGetTarget(out hybridRenderer))
+            {
+                hybridRenderer.Element.Markdown=data;
+            }
+        }
+    }
+    public class MarkdownViewRenderer : ViewRenderer<MarkdownView, WebView>
+    {
+        private WebView editorView;
+        private MarkdownEditor editorTemplate = new MarkdownEditor();
+        private MarkdownDeep.Markdown markdown = new MarkdownDeep.Markdown();
+        const string JavaScriptFunction = "function invokeCSharpAction(data){jsBridge.invokeAction(data);}";
+
+        private void SetMDEditorText(string text)
+        {
+            editorTemplate.Model = (text == null) ? null : markdown.Transform(text);
+            var html = editorTemplate.GenerateString();
+            editorView.LoadDataWithBaseURL("file:///android_asset/",
+            html, "text/html", "utf-8", null);
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<MarkdownView> e)
+        {
+            base.OnElementChanged(e);
+            if (Control == null)
+            {
+                editorView = new WebView(Context);
+                editorView.Settings.BuiltInZoomControls = true;
+                editorView.Settings.JavaScriptEnabled = true;
+                editorView.Settings.LoadsImagesAutomatically = true;
+                editorView.Settings.SetAppCacheEnabled(true);
+                editorView.Settings.AllowContentAccess = true;
+                editorView.Settings.AllowFileAccess = true;
+                editorView.Settings.AllowFileAccessFromFileURLs = true;
+                editorView.Settings.AllowUniversalAccessFromFileURLs = true;
+                editorView.Settings.BlockNetworkImage = false;
+                editorView.Settings.BlockNetworkLoads = false;
+                editorView.Settings.DomStorageEnabled = true;
+              //  editorView.SetMinimumHeight(300);
+                SetNativeControl(editorView);
+            }
+            if (e.OldElement != null)
+            {
+                // Unsubscribe
+            }
+            if (e.NewElement != null)
+            {
+                // Subscribe
+                var viewclient = new MarkdownWebViewClient(
+                md => { e.NewElement.Markdown = md; });
+                editorView.SetWebViewClient(viewclient);
+                Control.AddJavascriptInterface(new JSBridge(this), "jsBridge");
+                SetMDEditorText(e.NewElement.Markdown);
+                InjectJS(JavaScriptFunction);
+            }
+        }
+        
+
+        void InjectJS(string script)
+        {
+            if (Control != null)
+            {
+                Control.LoadUrl(string.Format("javascript: {0}", script));
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar.Droid/MarkdownWebViewClient.cs b/BookAStar/BookAStar.Droid/MarkdownWebViewClient.cs
index ef038ed8..c98e4e27 100644
--- a/BookAStar/BookAStar.Droid/MarkdownWebViewClient.cs
+++ b/BookAStar/BookAStar.Droid/MarkdownWebViewClient.cs
@@ -16,6 +16,7 @@ using Android.Content.Res;
 
 namespace BookAStar.Droid
 {
+
     class MarkdownWebViewClient : WebViewClient
     {
         Action<string> update;
@@ -25,7 +26,7 @@ namespace BookAStar.Droid
         }
         private static Activity getActivity ()
         {
-            return (Activity)App.PlateformSpecificInstance;
+            return (Activity)App.PlatformSpecificInstance;
         }
         public string Markdown { get; private set; }
         public override WebResourceResponse ShouldInterceptRequest(WebView view, IWebResourceRequest request)
@@ -34,6 +35,8 @@ namespace BookAStar.Droid
             {
                 if (request.Url.Path=="/android_asset/validate")
                 {
+                    // TODO Better,
+                    // by inspecting the form entries from the view
                     Markdown = request.Url.GetQueryParameter("md");
                     update(Markdown);
                     return new WebResourceResponse("application/json", "utf-8" ,200, "Ok", null, null);
@@ -41,5 +44,6 @@ namespace BookAStar.Droid
             }
             return base.ShouldInterceptRequest(view, request);
         }
+        
     }
 }
\ No newline at end of file
diff --git a/BookAStar/BookAStar.Droid/Properties/AssemblyInfo.cs b/BookAStar/BookAStar.Droid/Properties/AssemblyInfo.cs
index fc15563a..dc2f739a 100644
--- a/BookAStar/BookAStar.Droid/Properties/AssemblyInfo.cs
+++ b/BookAStar/BookAStar.Droid/Properties/AssemblyInfo.cs
@@ -13,7 +13,7 @@ using Android.App;
 [assembly: AssemblyProduct("BookAStar.Droid")]
 [assembly: AssemblyCopyright("Copyright © Paul Albert Schneider 2016")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyCulture("fr")]
 [assembly: ComVisible(false)]
 
 // Version information for an assembly consists of the following four values:
diff --git a/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs b/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs
index 2c444114..6cf15c7a 100644
--- a/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs
+++ b/BookAStar/BookAStar.Droid/Resources/Resource.Designer.cs
@@ -3232,64 +3232,67 @@ namespace BookAStar.Droid
 			public const int design_navigation_menu_item = 2130903076;
 			
 			// aapt resource value: 0x7f030025
-			public const int mr_chooser_dialog = 2130903077;
+			public const int EditEstimate = 2130903077;
 			
 			// aapt resource value: 0x7f030026
-			public const int mr_chooser_list_item = 2130903078;
+			public const int mr_chooser_dialog = 2130903078;
 			
 			// aapt resource value: 0x7f030027
-			public const int mr_controller_material_dialog_b = 2130903079;
+			public const int mr_chooser_list_item = 2130903079;
 			
 			// aapt resource value: 0x7f030028
-			public const int mr_controller_volume_item = 2130903080;
+			public const int mr_controller_material_dialog_b = 2130903080;
 			
 			// aapt resource value: 0x7f030029
-			public const int mr_playback_control = 2130903081;
+			public const int mr_controller_volume_item = 2130903081;
 			
 			// aapt resource value: 0x7f03002a
-			public const int mr_volume_control = 2130903082;
+			public const int mr_playback_control = 2130903082;
 			
 			// aapt resource value: 0x7f03002b
-			public const int notification_media_action = 2130903083;
+			public const int mr_volume_control = 2130903083;
 			
 			// aapt resource value: 0x7f03002c
-			public const int notification_media_cancel_action = 2130903084;
+			public const int notification_media_action = 2130903084;
 			
 			// aapt resource value: 0x7f03002d
-			public const int notification_template_big_media = 2130903085;
+			public const int notification_media_cancel_action = 2130903085;
 			
 			// aapt resource value: 0x7f03002e
-			public const int notification_template_big_media_narrow = 2130903086;
+			public const int notification_template_big_media = 2130903086;
 			
 			// aapt resource value: 0x7f03002f
-			public const int notification_template_lines = 2130903087;
+			public const int notification_template_big_media_narrow = 2130903087;
 			
 			// aapt resource value: 0x7f030030
-			public const int notification_template_media = 2130903088;
+			public const int notification_template_lines = 2130903088;
 			
 			// aapt resource value: 0x7f030031
-			public const int notification_template_part_chronometer = 2130903089;
+			public const int notification_template_media = 2130903089;
 			
 			// aapt resource value: 0x7f030032
-			public const int notification_template_part_time = 2130903090;
+			public const int notification_template_part_chronometer = 2130903090;
 			
 			// aapt resource value: 0x7f030033
-			public const int select_dialog_item_material = 2130903091;
+			public const int notification_template_part_time = 2130903091;
 			
 			// aapt resource value: 0x7f030034
-			public const int select_dialog_multichoice_material = 2130903092;
+			public const int select_dialog_item_material = 2130903092;
 			
 			// aapt resource value: 0x7f030035
-			public const int select_dialog_singlechoice_material = 2130903093;
+			public const int select_dialog_multichoice_material = 2130903093;
 			
 			// aapt resource value: 0x7f030036
-			public const int support_simple_spinner_dropdown_item = 2130903094;
+			public const int select_dialog_singlechoice_material = 2130903094;
 			
 			// aapt resource value: 0x7f030037
-			public const int Tabbar = 2130903095;
+			public const int support_simple_spinner_dropdown_item = 2130903095;
 			
 			// aapt resource value: 0x7f030038
-			public const int Toolbar = 2130903096;
+			public const int Tabbar = 2130903096;
+			
+			// aapt resource value: 0x7f030039
+			public const int Toolbar = 2130903097;
 			
 			static Layout()
 			{
diff --git a/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-48px.png b/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-48px.png
new file mode 100644
index 0000000000000000000000000000000000000000..935b79469adfacbaf2506ac702bad9681d3aa13c
GIT binary patch
literal 1700
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

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-64px.png b/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-64px.png
new file mode 100644
index 0000000000000000000000000000000000000000..801dda7042b12ca966e01af318e2c09254590602
GIT binary patch
literal 2426
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

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-73px.png b/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-73px.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ba761202472003bfee690bedff054f239c8a0d4
GIT binary patch
literal 2516
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

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-org.png b/BookAStar/BookAStar.Droid/Resources/drawable/Icon-anon-org.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf69e28ccae2f84e5e136b09163203126c3dee8c
GIT binary patch
literal 2719
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
Z>HkfZI?bR6m)rmV002ovPDHLkV1kbpM`i#3

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar.Droid/Resources/drawable/icon-anon.png b/BookAStar/BookAStar.Droid/Resources/drawable/icon-anon.png
new file mode 100644
index 0000000000000000000000000000000000000000..38d6db946724a8c9a2bac8cd7d2a08d7e1bacaac
GIT binary patch
literal 1031
zcmV+i1o-=jP)<h;3K|Lk000e1NJLTq001BW0018d1ONa4EMEr)00002VoOIv0RM-N
z%)bBt010qNS#tmY3J3rI3J3vb2*g<c000McNliru;0YA~85}=GfvErh1DHufK~y-)
zg_T=qTvZf?zkknUCUIg~k~C>*YZ{1Bi=>U_!P|?qRLwLcD)yli#Gs-tQVEEt2#O%0
zNCd$f7Fw(LWWh8=TT+Bl+otJD2-Gw}bFq<FJ7zLYbD5d5d^nTL$xO8C<#1U4`uDo+
ze~VIcY@&v0w$Mx!kYbcyNpPJ>JZ@@RIl_LLs3nHW6UL~eiT!-d)?&C;{H@^yV!Vz0
z2f5=d(tOFx>h4y0sk>>0b@bA@nxlnJg1?Ufu*W?XS_RufOKIhYg5`7okMHO>6h9Nc
z5I-J&6`(y>_+jn}_MnQ-*casMDEHn~x8>ai<F@zsz;2EeAm8#Lvr7aobCk(~FOD5m
zCzcPFJmg)|y?wt2&e+70d<+g~W<xL>><;b3lOUr-<&ca}9q+6tW0LhW`xzYOCDK8H
z_GfiaHZQT=$~DcfRbxnV75(!8*e!g@GhrGyzcL(Lml5G9dq8PH1(P~R%8clJ{2YMY
zV1R}&)toLKiQNg6YUB%k!(%5q=(Nuj!y1c#r>SwQAyG1Ci6kE|L>A)+Gi*@>2E{w^
zH&u>GG9~e&Mh-_52b8g%zbpgTl_KCGw>oZPp`?WG0Aygm0a6@O$V6_i2)MuoN98J4
zbQolkvA{lB_>mF9@)9RfML3U2N0QQQAK_2K%;O2}<{SFWVW_7B7b5AnN~Gl0Ub8VI
zMXi}>hN(av8Gb4uh;Y@BChD(m!Fn_L9x$gEQNKcQxo@C=*zJF!q{AesVd81huD#5K
zZ7tii%UZM<AZsV(EwyN4{1j(7p-c7;S+aOQ4N0+%=Xfvv1`pFjJ+b90YC_rwOd6Qs
zmSrl*w8rdI-}}7AR{}oV)g8f1hVw6<A<U$Ry`mgFWD5f}VPGa{fs-H6?SMB&<}iU1
zLNb%TjF_&I2neK^ge086F3<D2znt03)Vj_HAPh;%%9LS{i+Fi)&XeX<BBjyiGZ&Wx
zr7ZT#BW<3U1;edWybYO|NlyJ2(hrg;$a;9~)cv)gWw=Sj>y7*d2+MIcF;h>@S9;&F
zGuzIOI|=jq=(lP)6GNCVL!LA+G1KCQuY6cSWrGiGi}`_m29kk)t{Em!nlnR-ZH2+O
z06{Ku&$+Il*|aNPYJef~Nnz#Oa6_qcU5l-OxuVscjmAAq_2G(;90ClFoMq>(OppJ-
zf&YISm#iv$d-djUgSA-$(v$|Xe<a4T6U>%E{{_x7U>*AxW0e2^002ovPDHLkV1oC>
B*){+G

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar.Droid/Resources/layout/EditEstimate.axml b/BookAStar/BookAStar.Droid/Resources/layout/EditEstimate.axml
new file mode 100644
index 00000000..cee4ac19
--- /dev/null
+++ b/BookAStar/BookAStar.Droid/Resources/layout/EditEstimate.axml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/BookAStar/BookAStar/App.xaml b/BookAStar/BookAStar/App.xaml
index a92e358b..92a8dfbe 100644
--- a/BookAStar/BookAStar/App.xaml
+++ b/BookAStar/BookAStar/App.xaml
@@ -5,25 +5,33 @@
   <Application.Resources>
     <ResourceDictionary>
       <OnPlatform x:TypeArguments="Font" Android="Large" iOS="Large" WinPhone="Large" x:Key="HeaderFont" />
-      <OnPlatform x:TypeArguments="Color" Android="White" iOS="White" WinPhone="White" x:Key="PrimaryTextColor" />
+      <OnPlatform x:TypeArguments="Color" Android="Black" iOS="Black" WinPhone="Black" x:Key="PrimaryTextColor" />
+      <OnPlatform x:TypeArguments="Color" Android="Red" iOS="Red" WinPhone="Red" x:Key="EmphasisTextColor" />
       <OnPlatform x:TypeArguments="Font" Android="40" iOS="60" WinPhone="60" x:Key="LargeFontSize" />
       <OnPlatform x:TypeArguments="Font" Android="30" iOS="60" WinPhone="60" x:Key="MediumFontSize" />
       
       <Color x:key="backgroundColor">#30FAFAFA</Color>
+      <Color x:key="oddColor">#207AFAFA</Color>
       <Color x:key="textColor">#FF103010</Color>
       <Color x:key="labelColor">#FF303010</Color>
+      <Style x:Key="BigEntry" TargetType="Entry">
+        <Setter Property="FontSize" Value="{DynamicResource LargeFontSize}" />
+        <Setter Property="FontAttributes" Value="Bold" />
+      </Style>
       <Style x:Key="labelStyle" TargetType="Label">
-        <Setter Property="TextColor" Value="{DynamicResource labelColor}" />
+        <Setter Property="TextColor" Value="{DynamicResource EmphasisTextColor}" />
         <Setter Property="FontAttributes" Value="Bold" />
-        <Setter Property="FontSize" Value="Large" />
+        <Setter Property="FontSize" Value="{DynamicResource LargeFontSize}" />
         <Setter Property="VerticalOptions" Value="Start" />
-        <Setter Property="XAlign" Value="Center" />
+        <Setter Property="LineBreakMode" Value="WordWrap" />
+        
       </Style>
       <Style x:Key="entryStyle" TargetType="Entry">
         <Setter Property="HorizontalOptions" Value="FillAndExpand"/>
       </Style>
       <Style x:key="backbroundStyle" TargetType="VisualElement">
-        <Setter Property="BackgoundColor" Value="{DynamicResource backgroundColor}" />
+        <Setter Property="BackgoundColor" Value="{StaticResource backgroundColor}" />
+        <Setter Property="TextColor" Value="{StaticResource textColor}" />
       </Style>
       <Style x:Key="buttonStyle" TargetType="Button">
         <Setter Property="HorizontalOptions" Value="Center" />
diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index 15f18aad..4d0b8edd 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -1,15 +1,11 @@
-using BookAStar.Model;
-using BookAStar.Model.Auth.Account;
+using BookAStar.Helpers;
+using BookAStar.Interfaces;
+using BookAStar.Model;
+using BookAStar.Model.Workflow;
 using BookAStar.Pages;
 using System;
-using System.Diagnostics;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
 /*
 Glyphish icons from
 http://www.glyphish.com/
@@ -22,41 +18,47 @@ namespace BookAStar
 {
     public partial class App : Application // superclass new in 1.3
     {
-        SearchPage searchPage;
-        NavigationPage mp;
-        SettingsPage settingsPage;
-        PinPage pinPage;
         ContentPage deviceInfoPage;
-        BookQueryPage bookQueryPage;
-        BookQueriesPage bookQueriesPage;
-        public static IPlatform PlateformSpecificInstance { get; set; }
+        SearchPage searchPage = new SearchPage
+        {
+            Title = "Trouvez votre artiste",
+            Icon = "glyphish_07_map_marker.png"
+        };
+        NavigationPage mp;
+        SettingsPage settingsPage = new SettingsPage
+            {
+                Title = "Paramètres",
+                Icon = "ic_corp_icon.png"
+            };
+        PinPage pinPage = new PinPage
+        {
+            Title = "Carte",
+            Icon = "glyphish_07_map_marker.png"
+        };
+        BookQueryPage bookQueryPage = new BookQueryPage {
+            Title = "Demande de devis"
+        };
+        BookQueriesPage bookQueriesPage = new BookQueriesPage
+        {
+            Title = "Demandes de devis"
+        };
+
+        EditEstimatePage editEstimate = new EditEstimatePage
+        {
+            Title = "Création d'un devis"
+        };
+        public static IPlatform PlatformSpecificInstance { get; set; }
         public static string AppName { get; set; }
         public static App CurrentApp { get { return Current as App; } }
 
-        public DataManager DataManager { get; set; }
-
+        public DataManager DataManager { get; set; } = new DataManager();
+        
         public App(IPlatform instance)
         {
-            DataManager = new DataManager();
             deviceInfoPage = new DeviceInfoPage(instance.GetDeviceInfo());
-            bookQueriesPage = new BookQueriesPage();
-
-            PlateformSpecificInstance = instance;
-            searchPage = new SearchPage
-            {
-                Title = "Trouvez votre artiste",
-                Icon = "glyphish_07_map_marker.png"
-            };
+            PlatformSpecificInstance = instance;
             mp = new NavigationPage(searchPage);
-            settingsPage = new SettingsPage
-            {
-                Title = "Settings",
-                Icon = "ic_corp_icon.png"
-            };
-
-            var r = this.Resources;
             //var hasLabelStyle = r.ContainsKey("labelStyle");
-
             // var stid = this.StyleId;
             // null var appsstyle = settingsPage.Style;
             // appsstyle.CanCascade = true;
@@ -69,24 +71,16 @@ namespace BookAStar
             mp.ToolbarItems.Add(tiSetts);
             tiSetts.Clicked += (object sender, EventArgs e) =>
             {
-                if (settingsPage.Parent == null)
-                    mp.Navigation.PushAsync(settingsPage);
-                else
-                {
-                    settingsPage.Focus();
-                }
+                ShowPage (settingsPage);
             };
             ToolbarItem tiQueries = new ToolbarItem
             {
                 Text = "Demandes"
             };
 
-
             tiQueries.Clicked += (object sender, EventArgs e) =>
             {
-                if (bookQueriesPage.Parent == null)
-                    mp.Navigation.PushAsync(bookQueriesPage);
-                else bookQueriesPage.Focus();
+                ShowPage (bookQueriesPage);
             };
             mp.ToolbarItems.Add(tiQueries);
             ToolbarItem tiMap = new ToolbarItem
@@ -95,41 +89,46 @@ namespace BookAStar
                 Icon = "glyphish_07_map_marker.png"
             };
             mp.ToolbarItems.Add(tiMap);
-            pinPage = new PinPage
-            {
-                Title = "Carte",
-                Icon = "glyphish_07_map_marker.png"
-            };
             tiMap.Clicked += (object sender, EventArgs e) =>
             {
-                if (pinPage.Parent == null)
-                    mp.Navigation.PushAsync(pinPage);
-                else pinPage.Focus();
-
+                ShowPage(pinPage);
             };
 
+            bookQueriesPage.BindingContext = DataManager.BookQueries;
+
+           
         }
 
         public void ShowDeviceInfo()
         {
-            if (deviceInfoPage.Parent == null)
-                mp.Navigation.PushAsync(deviceInfoPage);
-            else deviceInfoPage.Focus();
+            ShowPage(deviceInfoPage);
         }
 
         public void PostDeviceInfo()
         {
-            var res = PlateformSpecificInstance.InvokeApi(
+            var res = PlatformSpecificInstance.InvokeApi(
                 "gcm/register",
-                PlateformSpecificInstance.GetDeviceInfo());
+                PlatformSpecificInstance.GetDeviceInfo());
         }
 
         public void ShowBookQuery(BookQueryData data)
         {
-            bookQueriesPage.BindingContext = data;
-            mp.Navigation.PushAsync(bookQueriesPage);
+            bookQueryPage.BindingContext = data;
+            ShowPage(bookQueryPage);
         }
 
+        public void EditEstimate(Estimate data)
+        {
+            editEstimate.Estimate = data;
+            ShowPage(editEstimate);
+        }
+
+        private void ShowPage(Page p)
+        {
+            if (p.Parent == null)
+                mp.Navigation.PushAsync(p);
+            else p.Focus();
+        }
         public void CloseWindow()
         {
             mp.Navigation.PopAsync();
diff --git a/BookAStar/BookAStar/BookAStar.csproj b/BookAStar/BookAStar/BookAStar.csproj
index 45bd3104..95e58428 100644
--- a/BookAStar/BookAStar/BookAStar.csproj
+++ b/BookAStar/BookAStar/BookAStar.csproj
@@ -38,8 +38,12 @@
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="DataManager.cs" />
+    <Compile Include="Constants.cs" />
+    <Compile Include="Helpers\AvatarImageSource.cs" />
+    <Compile Include="Helpers\DataManager.cs" />
     <Compile Include="Helpers\RemoteEntityRO.cs" />
+    <Compile Include="Interfaces\IMDEditor.cs" />
+    <Compile Include="Model\ClientProviderInfo.cs" />
     <Compile Include="Pages\BlogPage.cs" />
     <Compile Include="Pages\BookQueriesPage.xaml.cs">
       <DependentUpon>BookQueriesPage.xaml</DependentUpon>
@@ -53,7 +57,7 @@
     </Compile>
     <Compile Include="Helpers\MainSettings.cs" />
     <Compile Include="Helpers\RemoteEntity.cs" />
-    <Compile Include="IPlatform.cs" />
+    <Compile Include="Interfaces\IPlatform.cs" />
     <Compile Include="Pages\MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
@@ -96,8 +100,8 @@
     <Compile Include="Model\Auth\Tokens.cs" />
     <Compile Include="Model\Auth\User.cs" />
     <Compile Include="Model\Workflow\Estimate.cs" />
-    <Compile Include="Pages\MakeAnEstimatePage.xaml.cs">
-      <DependentUpon>MakeAnEstimatePage.xaml</DependentUpon>
+    <Compile Include="Pages\EditEstimatePage.xaml.cs">
+      <DependentUpon>EditEstimatePage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Pages\MarkdownEditorPage.xaml.cs">
       <DependentUpon>MarkdownEditorPage.xaml</DependentUpon>
@@ -105,9 +109,6 @@
     <Compile Include="Pages\PinPage.cs" />
     <Compile Include="Views\MarkdownView.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Pages\QueriesPage.xaml.cs">
-      <DependentUpon>QueriesPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Pages\SearchPage.xaml.cs">
       <DependentUpon>SearchPage.xaml</DependentUpon>
     </Compile>
@@ -198,12 +199,6 @@
       <Name>Yavsc.Client</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Pages\QueriesPage.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Pages\MarkdownEditorPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
@@ -211,7 +206,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Pages\MakeAnEstimatePage.xaml">
+    <EmbeddedResource Include="Pages\EditEstimatePage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -222,6 +217,9 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="icon-anon.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/BookAStar/BookAStar/Constants.cs b/BookAStar/BookAStar/Constants.cs
index 904f884d..f1c21e1d 100644
--- a/BookAStar/BookAStar/Constants.cs
+++ b/BookAStar/BookAStar/Constants.cs
@@ -3,12 +3,44 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Xamarin.Forms;
 
 namespace BookAStar
 {
     public static class Constants
     {
         public const string ApplicationName = "Booking Star";
-        public const string UserInfoUrl = "http://dev.pschneider.fr/api/me";
+
+        #region Uri
+
+        public const string YavscHomeUrl = "http://dev.pschneider.fr";
+        public static readonly string YavscApiUrl = YavscHomeUrl + "/api";
+        public static readonly string MobileRegistrationUrl = YavscApiUrl + "/gcm/register";
+        public static readonly string UserInfoUrl = YavscApiUrl + "/me";
+        public static readonly string BlogUrl = YavscApiUrl + "/blogs";
+
+        #endregion
+
+        #region Colors & sizes
+
+        public static readonly Thickness PagePadding =
+            new Thickness(5, Device.OnPlatform(20, 20, 20), 5, 5);
+
+        public static readonly Thickness DefaultPadding =
+            new Thickness(5, Device.OnPlatform(20, 20, 20), 3, 3);
+
+        public static readonly Font TitleFont =
+            Font.SystemFontOfSize(Device.OnPlatform(50, 50, 50), FontAttributes.Bold);
+
+        public static readonly Color OddBackgroundColor =
+            Device.OnPlatform(Color.Aqua, Color.Aqua, Color.Aqua);
+
+        public static readonly Color ForegroundColor =
+            Device.OnPlatform(Color.White, Color.White, Color.White);
+
+        public static readonly Color BackgroundColor =
+            Device.OnPlatform(Color.Black, Color.White, Color.White);
+
+        #endregion
     }
 }
diff --git a/BookAStar/BookAStar/Helpers/AvatarImageSource.cs b/BookAStar/BookAStar/Helpers/AvatarImageSource.cs
new file mode 100644
index 00000000..d254ceff
--- /dev/null
+++ b/BookAStar/BookAStar/Helpers/AvatarImageSource.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace BookAStar
+{
+    [ContentProperty("Source")]
+    public class AvatarImageSourceExtension : IMarkupExtension
+    {
+        public string Source { get; set; }
+
+        public object ProvideValue(IServiceProvider serviceProvider)
+        {
+            
+            // Do your translation lookup here, using whatever method you require
+            
+            if (Source != null)
+            {
+                return ImageSource.FromUri(new Uri(Source));
+            }
+            return ImageSource.FromResource("BookAStar.icon-anon.png");
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/DataManager.cs b/BookAStar/BookAStar/Helpers/DataManager.cs
similarity index 74%
rename from BookAStar/BookAStar/DataManager.cs
rename to BookAStar/BookAStar/Helpers/DataManager.cs
index ffc2d78d..48713bf4 100644
--- a/BookAStar/BookAStar/DataManager.cs
+++ b/BookAStar/BookAStar/Helpers/DataManager.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BookAStar
+namespace BookAStar.Helpers
 {
     using Model;
     using Model.Blog;
@@ -13,9 +13,11 @@ namespace BookAStar
     public class DataManager
     {
         // TODO userinfo estimatetemplate rating service product tag   
-        public RemoteEntity<BookQueryData, long> BookQueries { get; set; }
+        public RemoteEntityRO<BookQueryData, long> BookQueries { get; set; }
         public RemoteEntity<Estimate, long> Estimates { get; set; }
         public RemoteEntity<Blog, long> Blogspot { get; set; }
+        public LocalEntity<ClientProviderInfo,string> Contacts { get; set; }
+
         public static DataManager Current
         {
             get
@@ -23,15 +25,18 @@ namespace BookAStar
                 return App.CurrentApp.DataManager;
             }
         }
+
         public DataManager()
         {
-            BookQueries = new RemoteEntity<BookQueryData, long>("bookquery",
+            BookQueries = new RemoteEntityRO<BookQueryData, long>("bookquery",
                 q => q.Id);
             Estimates = new RemoteEntity<Estimate, long>("estimate",
                 x => x.Id);
             Blogspot = new RemoteEntity<Blog, long>("blog", 
                 x=>x.Id);
+            Contacts = new LocalEntity<ClientProviderInfo, string>(c => c.UserId);
         }
+
         public async Task<BookQueryData> GetBookQuery(long bookQueryId)
         {
             return await BookQueries.Get(bookQueryId);
diff --git a/BookAStar/BookAStar/Helpers/MainSettings.cs b/BookAStar/BookAStar/Helpers/MainSettings.cs
index 68ec1aec..974f33ee 100644
--- a/BookAStar/BookAStar/Helpers/MainSettings.cs
+++ b/BookAStar/BookAStar/Helpers/MainSettings.cs
@@ -204,11 +204,5 @@ namespace BookAStar
                 return environ;
             }
         }
-        public const string YavscHomeUrl = "http://dev.pschneider.fr";
-        public static readonly string YavscApiUrl = "http://dev.pschneider.fr/api";
-        public static readonly string MobileRegistrationUrl = YavscApiUrl + "/gcm/register";
-        public static readonly string UserInfoUrl = YavscApiUrl + "/me";
-        public static readonly string BlogUrl = YavscApiUrl + "/blogs";
-        public const string ApplicationName = "BookAStar";
     }
 }
diff --git a/BookAStar/BookAStar/Helpers/RemoteEntity.cs b/BookAStar/BookAStar/Helpers/RemoteEntity.cs
index 37bf8947..e17a0ac5 100644
--- a/BookAStar/BookAStar/Helpers/RemoteEntity.cs
+++ b/BookAStar/BookAStar/Helpers/RemoteEntity.cs
@@ -9,27 +9,47 @@ using System.Threading.Tasks;
 
 namespace BookAStar
 {
-    public class RemoteEntity<V,K> : ObservableCollection<V>, ICommand where K : IEquatable<K>
+    public class LocalEntity<V, K> : ObservableCollection<V> where K : IEquatable<K>
+    {
+        protected Func<V, K> GetKey { get; set; }
+        public LocalEntity(Func<V, K> getKey) : base()
+        {
+            if (getKey == null) throw new InvalidOperationException();
+            GetKey = getKey;
+        }
+        public virtual void Merge(V item)
+        {
+            var key = GetKey(item);
+            if (this.Any(x => GetKey(x).Equals(key)))
+            {
+                Remove(LocalGet(key));
+            }
+            Add(item);
+        }
+        public V LocalGet(K key)
+        {
+            return this.Single(x => GetKey(x).Equals(key));
+        }
+    }
+
+    public class RemoteEntity<V,K> : LocalEntity<V, K>, ICommand where K : IEquatable<K>
     {
         private string _controller;
         public event EventHandler CanExecuteChanged;
         public bool IsExecuting { get; private set; }
-        private HttpClient client;
+        
         private Uri controllerUri;
-        protected Func<V, K> GetKey { get; set; }
         public bool CanExecute(object parameter)
         {
             return !IsExecuting;
         }
 
-        public RemoteEntity(string controllerName, Func<V,K> getKey):base()
+        public RemoteEntity(string controllerName, Func<V,K> getKey):base(getKey)
         {
-            if (string.IsNullOrWhiteSpace(controllerName) || getKey == null)
+            if (string.IsNullOrWhiteSpace(controllerName))
                 throw new InvalidOperationException();
             _controller = controllerName;
-            GetKey = getKey;
-            client = new HttpClient();
-            controllerUri = new Uri(MainSettings.YavscApiUrl + "/" + _controller);
+            controllerUri = new Uri(Constants.YavscApiUrl + "/" + _controller);
         }
 
         private void BeforeExecute()
@@ -49,38 +69,30 @@ namespace BookAStar
         {
             BeforeExecute();
             // Update credentials 
-            client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue(
-                "Bearer", MainSettings.CurrentUser.YavscTokens.AccessToken);
-            // Get the whole data
-  
-            var response = await client.GetAsync(controllerUri);
-            if (response.IsSuccessStatusCode)
+            using (HttpClient client = new HttpClient())
             {
-                var content = await response.Content.ReadAsStringAsync();
-                List<V> col  = JsonConvert.DeserializeObject<List<V>>(content);
-                // LocalData.Clear();
-                foreach (var item in col)
+                client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue(
+                    "Bearer", MainSettings.CurrentUser.YavscTokens.AccessToken);
+                // Get the whole data
+
+                using (var response = await client.GetAsync(controllerUri))
                 {
-                    UpdateOrAdd(item);
+                    if (response.IsSuccessStatusCode)
+                    {
+                        var content = await response.Content.ReadAsStringAsync();
+                        List<V> col = JsonConvert.DeserializeObject<List<V>>(content);
+                        // LocalData.Clear();
+                        foreach (var item in col)
+                        {
+                            Merge(item);
+                        }
+                    }
                 }
             }
-
             AfterExecuting();
         }
-        protected virtual void UpdateOrAdd (V item)
-        {
-            var key = GetKey(item);
-            if (this.Any(x => GetKey(x).Equals(key)))
-            {
-                Remove(LocalGet(key));
-            }
-            Add(item);
-        }
 
-        public V LocalGet(K key)
-        {
-            return this.Single(x => GetKey(x).Equals(key));
-        }
+        
 
         private void AfterExecuting()
         {
@@ -96,13 +108,18 @@ namespace BookAStar
             // Get the whole data
             var uri = new Uri(controllerUri.AbsolutePath+"/"+key.ToString());
 
-            var response = await client.GetAsync(uri);
-            if (response.IsSuccessStatusCode)
+            using (HttpClient client = new HttpClient())
             {
-                var content = await response.Content.ReadAsStringAsync();
-                item = JsonConvert.DeserializeObject<V>(content);
-                // LocalData.Clear();
-                    UpdateOrAdd(item);
+                using (var response = await client.GetAsync(uri))
+                {
+                    if (response.IsSuccessStatusCode)
+                    {
+                        var content = await response.Content.ReadAsStringAsync();
+                        item = JsonConvert.DeserializeObject<V>(content);
+                        // LocalData.Clear();
+                        Merge(item);
+                    }
+                }
             }
 
             AfterExecuting();
diff --git a/BookAStar/BookAStar/Helpers/RemoteEntityRO.cs b/BookAStar/BookAStar/Helpers/RemoteEntityRO.cs
index 9688d23d..27ef8253 100644
--- a/BookAStar/BookAStar/Helpers/RemoteEntityRO.cs
+++ b/BookAStar/BookAStar/Helpers/RemoteEntityRO.cs
@@ -7,14 +7,14 @@ using System.Threading.Tasks;
 
 namespace BookAStar.Helpers
 {
-    class RemoteEntityRO<V,K>: RemoteEntity<V,K> where K: IEquatable<K>
+    public class RemoteEntityRO<V,K>: RemoteEntity<V,K> where K: IEquatable<K>
     {
         public RemoteEntityRO (string controllerName,
             Func<V,K> getKey) : base(controllerName,getKey)
         {
         }
 
-        protected override void UpdateOrAdd(V item)
+        public override void Merge(V item)
         {
             var key = GetKey(item);
             if (this.Any(x => GetKey(x).Equals(key))) { return; }
diff --git a/BookAStar/BookAStar/Interfaces/IMDEditor.cs b/BookAStar/BookAStar/Interfaces/IMDEditor.cs
new file mode 100644
index 00000000..108b1b77
--- /dev/null
+++ b/BookAStar/BookAStar/Interfaces/IMDEditor.cs
@@ -0,0 +1,13 @@
+using System;
+using Xamarin.Forms;
+
+namespace BookAStar.Interfaces
+{
+    public interface IMDEditor
+    {
+        View EditorView { get; }
+        string Text { get; set; }
+        bool Editable { get; set; }
+        Action<string> Edited { get; set; }
+    }
+}
diff --git a/BookAStar/BookAStar/IPlatform.cs b/BookAStar/BookAStar/Interfaces/IPlatform.cs
similarity index 85%
rename from BookAStar/BookAStar/IPlatform.cs
rename to BookAStar/BookAStar/Interfaces/IPlatform.cs
index 2459d997..d2f9f914 100644
--- a/BookAStar/BookAStar/IPlatform.cs
+++ b/BookAStar/BookAStar/Interfaces/IPlatform.cs
@@ -3,14 +3,13 @@ using System;
 using Xamarin.Forms;
 using Yavsc.Models.Identity;
 
-namespace BookAStar
+namespace BookAStar.Interfaces
 {
     public interface IPlatform
 	{
         void OpenWeb (string Uri);
         
         // TODO Better
-
 		string GCMStatusMessage { get; }
 
         bool EnablePushNotifications (bool enable);
@@ -24,8 +23,6 @@ namespace BookAStar
         TAnswer InvokeApi<TAnswer>(string method, object arg);
 
         object InvokeApi(string method, object arg);
-
-        View CreateMarkdownView(string markdown, Action<string> update);
     }
 }
 
diff --git a/BookAStar/BookAStar/Model/BookQueryData.cs b/BookAStar/BookAStar/Model/BookQueryData.cs
index c413dc16..37d43a02 100644
--- a/BookAStar/BookAStar/Model/BookQueryData.cs
+++ b/BookAStar/BookAStar/Model/BookQueryData.cs
@@ -3,12 +3,6 @@ using System;
 
 namespace BookAStar.Model
 {
-    public class ClientProviderInfo
-    {
-        public string UserName { get; set; }
-        public string UserId { get; set;  }
-        public int Rate { get; set; }
-    }
     public class BookQueryData
     {
         public ClientProviderInfo Client { get; set; }
diff --git a/BookAStar/BookAStar/Model/ClientProviderInfo.cs b/BookAStar/BookAStar/Model/ClientProviderInfo.cs
new file mode 100644
index 00000000..3012c13e
--- /dev/null
+++ b/BookAStar/BookAStar/Model/ClientProviderInfo.cs
@@ -0,0 +1,23 @@
+using BookAStar.Model.Social;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BookAStar.Model
+{
+    public class ClientProviderInfo
+    {
+        public string UserName { get; set; }
+        
+        public string Avatar { get; set; }
+        // private string avatar;
+        //  public string Avatar { get { return avatar ?? "icon-anon.png"; }  set { avatar = value; } }
+        public string UserId { get; set; }
+        public int Rate { get; set; }
+        public string EMail { get; set; }
+        public string Phone { get; set; }
+        public Location BillingAddress { get; set; }
+    }
+}
diff --git a/BookAStar/BookAStar/Model/Manager.cs b/BookAStar/BookAStar/Model/Manager.cs
index 0aaf9d23..503b21e7 100644
--- a/BookAStar/BookAStar/Model/Manager.cs
+++ b/BookAStar/BookAStar/Model/Manager.cs
@@ -5,17 +5,14 @@ using System.Collections.ObjectModel;
 using System.Windows.Input;
 
 namespace BookAStar
-{
-
-   
-   
-
-       
+{      
+    [Obsolete("Use Helpers.DataManager")]
     public static class Manager
 	{
 	    static Manager ()
 		{
 		}
+
         public static ICommand RefreshBookQueries;
         // TODO WIP TEST rop this
         private static Location[] _places = new Location[] {
diff --git a/BookAStar/BookAStar/Model/Social/Location.cs b/BookAStar/BookAStar/Model/Social/Location.cs
index 751c11bf..fcc5f368 100644
--- a/BookAStar/BookAStar/Model/Social/Location.cs
+++ b/BookAStar/BookAStar/Model/Social/Location.cs
@@ -27,18 +27,16 @@ namespace BookAStar.Model.Social
     }
 
 
-    public class Location : Position {
-             
+    public class Location : Position
+    {
+
         public long Id { get; set; }
         public string Address { get; set; }
 
     }
 
-    public class  LocalizedEvent : YaEvent
+    public class LocalizedEvent : YaEvent
     {
-       
-
         public Location Location { get; set; }
-
-        }
+    }
 }
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Model/Workflow/Estimate.cs b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
index 0049345e..02d03b97 100644
--- a/BookAStar/BookAStar/Model/Workflow/Estimate.cs
+++ b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
@@ -1,13 +1,17 @@
-using System.Collections.Generic;
+using BookAStar.Helpers;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace BookAStar.Model.Workflow
 {
     public partial class Estimate
     {
         public long Id { get; set; }
-        
         public long? CommandId { get; set; }
+        public string CommandType { get; set; }
+        // Markdown expected
         public string Description { get; set; }
         public int? Status { get; set; }
         public string Title { get; set; }
@@ -23,7 +27,7 @@ namespace BookAStar.Model.Workflow
 
         public string AttachedGraphicsString
         {
-            get { return string.Join(":", AttachedGraphicList); }
+            get { return AttachedGraphicList==null?null:string.Join(":", AttachedGraphicList); }
             set { AttachedGraphicList = value.Split(':').ToList(); }
         }
         /// <summary>
@@ -36,12 +40,32 @@ namespace BookAStar.Model.Workflow
         public List<string> AttachedFiles { get; set; }
         public string AttachedFilesString
         {
-            get { return string.Join(":", AttachedFiles); }
+            get { return AttachedFiles == null ? null : string.Join(":", AttachedFiles); }
             set { AttachedFiles = value.Split(':').ToList(); }
         }
         
         public string OwnerId { get; set; }
         
         public string ClientId { get; set; }
+        
+        public BookQueryData Query
+        {
+            get
+            {
+                if (CommandId.HasValue)
+                {
+                    return DataManager.Current.BookQueries.LocalGet(CommandId.Value);
+                }
+                return null;
+            }
+        }
+
+        public ClientProviderInfo Client
+        {
+            get
+            {
+                return DataManager.Current.Contacts.LocalGet(ClientId);
+            }
+        }
     }
 }
diff --git a/BookAStar/BookAStar/Pages/BlogPage.cs b/BookAStar/BookAStar/Pages/BlogPage.cs
index d1b34e3b..c19d3f1f 100644
--- a/BookAStar/BookAStar/Pages/BlogPage.cs
+++ b/BookAStar/BookAStar/Pages/BlogPage.cs
@@ -17,7 +17,7 @@ namespace BookAStar.Pages
             _source = new HtmlWebViewSource();
             _sourceTitle = new HtmlWebViewSource();
             _md = new MarkdownDeep.Markdown();
-            _sourceTitle.BaseUrl = _source.BaseUrl = MainSettings.YavscHomeUrl;
+            _sourceTitle.BaseUrl = _source.BaseUrl = Constants.YavscHomeUrl;
             _sourceTitle.Html = "Hello";
             titleLabel = new WebView { Source = _sourceTitle };
             contentView = new WebView { Source = _source };
diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml
index d2f46536..bda36a88 100644
--- a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml
+++ b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml
@@ -1,40 +1,50 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:BookAStar.Views;assembly=BookAStar"
-             x:Class="BookAStar.Pages.BookQueriesPage">
-  <StackLayout>
+             xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
+             x:Class="BookAStar.Pages.BookQueriesPage"
+             Padding="{x:Static local:Constants.PagePadding}"
+             BackgroundColor="{x:Static local:Constants.BackgroundColor}"
+             >
+  <ContentPage.Resources>
+    <ResourceDictionary>
 
-  <ListView x:Name="list"
-	 HasUnevenRows="true" ItemTapped="OnViewDetail">
-    <ListView.ItemTemplate>
+      <Style x:Key="labelStyle" TargetType="Label">
+        <Setter Property="TextColor" Value="{DynamicResource EmphasisTextColor}" />
+        <Setter Property="FontAttributes" Value="Bold" />
+        <Setter Property="FontSize" Value="{DynamicResource LargeFontSize}" />
+        <Setter Property="VerticalOptions" Value="Start" />
+        <Setter Property="LineBreakMode" Value="WordWrap" />
+
+      </Style>
+
+    </ResourceDictionary> 
+  </ContentPage.Resources>
+
+  <StackLayout Padding="10,10,10,10">
+
+  <ListView x:Name="list" ItemTapped="OnViewDetail" HasUnevenRows="true" RowHeight="80">
+    <ListView.ItemTemplate HeightRequest="80" VerticalOptions="StartAndExpand">
       <DataTemplate>
         <ViewCell>
           <ViewCell.View>
-            <StackLayout Orientation="Horizontal">
-              <StackLayout Orientation="Vertical">
-                <Label Text="{Binding Title}" FontSize="12"/>
-                <Label Text="{Binding Description}"/>
-                <Label Text="{Binding Comment}"/>
-                <Label Text="{Binding CommandId}"/>
-                
-                <StackLayout Orientation="Horizontal">
-                  
-                  <StackLayout>
-                    <Label Text="Date:" FontAttributes="Italic"/>
-                    <Label Text="{Binding StartDate, StringFormat='{0:jj/MM/yyyy}'}" VerticalOptions="End"/>
-                  </StackLayout>
-                  <StackLayout>
-                    <Label Text="Heure:" FontAttributes="Italic" />
-                    <Label Text="{Binding StartDate, StringFormat='{0:H:mm}'}" VerticalOptions="End"/>
-                  </StackLayout>
-                  <StackLayout>
-                    <Label Text="Lieu:" FontAttributes="Italic"   VerticalOptions="End"/>
-                    <Label Text="{Binding Location.Address}"/>
-                  </StackLayout>
+            <StackLayout Orientation="Horizontal" Padding="10,10,10,10" VerticalOptions="StartAndExpand">
+                <StackLayout Orientation="Vertical" BackgroundColor="{x:Static local:Constants.OddBackgroundColor}"
+                             HeightRequest="80" VerticalOptions="StartAndExpand">
 
+                  <StackLayout Orientation="Vertical" >
+                    <Image Source="{Binding Client.Avatar}" />
+                    <Label Text="{Binding Client.UserName}"
+                      Style="{StaticResource labelStyle}"></Label>
+                  </StackLayout>
+                  
+                  <Label LineBreakMode="WordWrap" Text="{Binding EventDate, StringFormat='{0:dddd d MMMM à HH:mm}'}" FontSize="12" FontFamily="Italic"/>
+                </StackLayout>
+                <StackLayout Orientation="Vertical" VerticalOptions="StartAndExpand">
+                  <Label LineBreakMode="WordWrap" Text="{Binding Location.Address}"/>
+                  <Label Text="{Binding Previsionnal}"/>
+                  <Label Text="{Binding Id}" HorizontalTextAlignment="End"/>
                 </StackLayout>
-              </StackLayout>
             </StackLayout>
           </ViewCell.View>
         </ViewCell>
diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
index c278d4e5..977886bc 100644
--- a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
@@ -15,10 +15,11 @@ namespace BookAStar.Pages
         public BookQueriesPage()
         {
             InitializeComponent();
-            BindingContext = App.CurrentApp.DataManager.BookQueries;
+        }
+        protected override void OnBindingContextChanged()
+        {
             list.ItemsSource = BindingContext as ObservableCollection<BookQueryData>;
-            list.RefreshCommand = BindingContext as ICommand;
-            list.IsPullToRefreshEnabled = true;
+            base.OnBindingContextChanged();
         }
 
         public RemoteEntity<BookQueryData,long> Queries
@@ -40,7 +41,6 @@ namespace BookAStar.Pages
         {
             BookQueryData data = e.Item as BookQueryData;
             App.CurrentApp.ShowBookQuery(data);
-            throw new NotImplementedException();
         }
     }
 }
diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml b/BookAStar/BookAStar/Pages/BookQueryPage.xaml
index 9067855d..0925bce4 100644
--- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml
+++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml
@@ -1,19 +1,35 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
              xmlns:maps="clr-namespace:Xamarin.Forms.Maps;assembly=Xamarin.Forms.Maps.dll"
-             x:Class="BookAStar.Pages.BookQueryPage">
+             x:Class="BookAStar.Pages.BookQueryPage"
+             BackgroundColor="{x:Static local:Constants.BackgroundColor}"
+             Padding="{x:Static local:Constants.PagePadding}"
+             >
+  <ContentPage.Resources>
+    <ResourceDictionary>
+
+      <Style x:Key="labelStyle" TargetType="Label">
+        <Setter Property="TextColor" Value="{DynamicResource EmphasisTextColor}" />
+        <Setter Property="FontAttributes" Value="Bold" />
+        <Setter Property="FontSize" Value="{DynamicResource LargeFontSize}" />
+        <Setter Property="VerticalOptions" Value="Start" />
+        <Setter Property="LineBreakMode" Value="WordWrap" />
+      </Style>
+
+    </ResourceDictionary>
+  </ContentPage.Resources>
+
   <StackLayout x:Name="bookQueryLayout">
-    
-    
-  <Label Text="{Binding Title}" VerticalOptions="Start" HorizontalOptions="Center" />
-   <Label Text="{Binding Description}" VerticalOptions="FillAndExpand" HorizontalOptions="Center" />
-   <Label Text="{Binding CommandId}" VerticalOptions="Center" HorizontalOptions="Center" />
-   <Label Text="{Binding Comment}" VerticalOptions="Center" HorizontalOptions="Center" />
-   <Label Text="{Binding StartDate}" VerticalOptions="Center" HorizontalOptions="Center" />
-   <Label Text="{Binding EndDate}" VerticalOptions="Center" HorizontalOptions="Center" />
-   <Label Text="{Binding Location}" VerticalOptions="Center" HorizontalOptions="Center" />
+    <Label Text="{Binding Client.UserName}" Style="{StaticResource labelStyle}"
+         VerticalOptions="Start" HorizontalOptions="Center" />
+    <Label Text="{Binding Location.Address}" VerticalOptions="FillAndExpand" HorizontalOptions="Center" />
+    <Label Text="{Binding Previsional}" VerticalOptions="Center" HorizontalOptions="Center" />
+
+    <Label Text="{Binding EventDate}" VerticalOptions="Center" HorizontalOptions="Center" />
+    <Label Text="{Binding Location.Address}" VerticalOptions="Center" HorizontalOptions="Center" />
     <maps:Map x:Name="map"></maps:Map>
-   <Button Text="Faire un devis" Clicked="MakeAnEstimate" VerticalOptions="Center" HorizontalOptions="End"/>
-</StackLayout>
+    <Button Text="Faire un devis" Clicked="MakeAnEstimate" VerticalOptions="Center" HorizontalOptions="End"/>
+  </StackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
index 8211b72d..68357877 100644
--- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
@@ -6,7 +6,9 @@ using Xamarin.Forms.Maps;
 
 namespace BookAStar.Pages
 {
+    using Helpers;
     using Model;
+    using Model.Workflow;
     using System.Threading.Tasks;
 
     public partial class BookQueryPage : ContentPage
@@ -43,8 +45,9 @@ namespace BookAStar.Pages
                 map.MoveToRegion(MapSpan.FromCenterAndRadius(
                     new Position(lat, lon), Distance.FromMeters(100)));
             }
+            
         }
-        public BookQueryPage(BookQueryData bookQuery)
+        public BookQueryPage(BookQueryData bookQuery=null)
         {
             
             InitializeComponent();
@@ -55,9 +58,18 @@ namespace BookAStar.Pages
             
         }
 
-        private void MakeAnEstimate(object sender, EventArgs e)
+        private void MakeAnEstimate(object sender, EventArgs ev)
         {
-            throw new NotImplementedException();
+            DataManager.Current.Contacts.Merge(BookQuery.Client);
+            var e = new Estimate()
+            {
+                ClientId = BookQuery.Client.UserId,
+                CommandId = BookQuery.Id,
+                OwnerId = MainSettings.CurrentUser.Id,
+                Id = 0,
+                Description = "# **Hello Estimate!**"
+            };
+            App.CurrentApp.EditEstimate(e);
         }
         
     }
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
new file mode 100644
index 00000000..7b489cd4
--- /dev/null
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="BookAStar.Pages.EditEstimatePage"
+             xmlns:local="clr-namespace:BookAStar.Views;assembly=BookAStar"
+             >
+  <StackLayout Padding="10,10,10,10">
+    
+    <StackLayout Orientation="Horizontal" Padding="10,10,10,10">
+       <Label Text="{Binding Client.UserName}"
+        LineBreakMode="WordWrap"></Label>
+    <Label Text="{Binding Query.Location.Address}"
+         LineBreakMode="WordWrap"  ></Label>
+    <Label Text="{Binding Query.EventDate, StringFormat='{0:dddd d MMMM yyyy à hh:mm}'}"
+         LineBreakMode="WordWrap"  ></Label>
+    </StackLayout>
+    
+    <local:MarkdownView x:Name="mdview" Markdown="{Binding Description}"
+         Edited="OnDescriptionChanged" HorizontalOptions="FillAndExpand"
+                        VerticalOptions="FillAndExpand">
+      
+    </local:MarkdownView>
+
+   <!-- <ListView >
+      <ListView.ItemTemplate>
+        <DataTemplate>
+          <ViewCell>
+            <ViewCell.View>
+              <StackLayout Orientation="Horizontal">
+                <Entry Placeholder="Ligne de facture"></Entry>
+                <Entry Placeholder="Compte"></Entry>
+                <Entry Placeholder="Prix unitaire" ></Entry>
+              </StackLayout>
+            </ViewCell.View>
+          </ViewCell>
+        </DataTemplate>
+      </ListView.ItemTemplate>
+    </ListView> -->
+    <Label Text="Total TTC:"></Label>
+    <Button Text="Valider ce devis"></Button>
+  </StackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
new file mode 100644
index 00000000..5d4ecb15
--- /dev/null
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
@@ -0,0 +1,44 @@
+using BookAStar.Model;
+using BookAStar.Model.Workflow;
+using BookAStar.Views;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+
+namespace BookAStar.Pages
+{
+    public partial class EditEstimatePage : ContentPage
+    {
+        public Estimate Estimate { get { return BindingContext as Estimate;  } set {
+                BindingContext = value;
+            } }
+        public static readonly BindableProperty MarkdownProperty =
+            BindableProperty.Create("Description", typeof(string), typeof(Estimate),
+                null, BindingMode.TwoWay);
+        public static readonly BindableProperty ClientProperty =
+            BindableProperty.Create("Client", typeof(ClientProviderInfo), typeof(Estimate),
+                null, BindingMode.OneWay);
+        public static readonly BindableProperty QueryProperty =
+            BindableProperty.Create("Query", typeof(BookQueryData), typeof(Estimate),
+                null, BindingMode.OneWay);
+
+        public EditEstimatePage()
+        {
+            InitializeComponent();
+        }
+        protected override void OnBindingContextChanged()
+        {
+            base.OnBindingContextChanged();
+            mdview.Markdown = Estimate?.Description;
+        }
+
+        protected void OnDescriptionChanged (object sender, EventArgs e)
+        {
+            Estimate.Description = mdview.Markdown;
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/Pages/EventDetail.xaml.cs b/BookAStar/BookAStar/Pages/EventDetail.xaml.cs
index 9099b96e..70c2d88d 100644
--- a/BookAStar/BookAStar/Pages/EventDetail.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EventDetail.xaml.cs
@@ -15,7 +15,7 @@ namespace BookAStar
                 BindingContext = ev;
                 btn_webpage.Clicked += (object sender, EventArgs e) =>
                 {
-                    App.PlateformSpecificInstance.OpenWeb(ev.EventWebPage);
+                    App.PlatformSpecificInstance.OpenWeb(ev.EventWebPage);
                 };
             }
 
diff --git a/BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml b/BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml
deleted file mode 100644
index 0b3b4b8f..00000000
--- a/BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="BookAStar.Pages.MakeAnEstimatePage"
-             xmlns:local="clr-namespace:BookAStar.Views;assembly=BookAStar"
-             >
-
-    <local:MarkdownView x:Name="mdview" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" 
-                        Markdown="hello estimate"></local:MarkdownView>
-</ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml.cs b/BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml.cs
deleted file mode 100644
index 9d124474..00000000
--- a/BookAStar/BookAStar/Pages/MakeAnEstimatePage.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using BookAStar.Model.Workflow;
-using BookAStar.Views;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Xamarin.Forms;
-
-namespace BookAStar.Pages
-{
-    public partial class MakeAnEstimatePage : ContentPage
-    {
-        public Estimate Estimate { get { return BindingContext as Estimate;  } set {
-                BindingContext = value;
-            } }
-
-        public static readonly BindableProperty MarkdownProperty =
-            BindableProperty.Create("Description", typeof(string), typeof(Estimate),
-                null, BindingMode.TwoWay);
-        
-        public MakeAnEstimatePage(string clientId,long bookQueryId)
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/BookAStar/BookAStar/Pages/QueriesPage.xaml b/BookAStar/BookAStar/Pages/QueriesPage.xaml
deleted file mode 100644
index 19125c42..00000000
--- a/BookAStar/BookAStar/Pages/QueriesPage.xaml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="BookAStar.QueriesPage">
-  <Label Text="{Binding MainText}" VerticalOptions="Center" HorizontalOptions="Center" />
-</ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/QueriesPage.xaml.cs b/BookAStar/BookAStar/Pages/QueriesPage.xaml.cs
deleted file mode 100644
index a3bbc670..00000000
--- a/BookAStar/BookAStar/Pages/QueriesPage.xaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Xamarin.Forms;
-
-namespace BookAStar
-{
-    public partial class QueriesPage : ContentPage
-    {
-        public QueriesPage()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/BookAStar/BookAStar/Pages/SearchPage.xaml b/BookAStar/BookAStar/Pages/SearchPage.xaml
index c47a8d5d..7a9cfccb 100644
--- a/BookAStar/BookAStar/Pages/SearchPage.xaml
+++ b/BookAStar/BookAStar/Pages/SearchPage.xaml
@@ -6,10 +6,7 @@
              Padding="10,40,10,10" >
 	<ContentPage.Content>
 	<StackLayout>
-	<StackLayout Orientation="Horizontal">
-	<Label Text="Utiliser ma position" />
-	<Switch x:Name="use_my_pos" HorizontalOptions="End" />
-	</StackLayout>
+
     
 	<StackLayout Orientation="Horizontal">
 	<Editor x:Name="search_phrase" HorizontalOptions="FillAndExpand"/>
@@ -19,7 +16,6 @@
 
 	<ListView x:Name="list" ItemsSource="{x:Static local:Manager.Events}" 
 	 HasUnevenRows="true">
-    s
 				<ListView.ItemTemplate>
 					<DataTemplate>
 					<ViewCell>
diff --git a/BookAStar/BookAStar/Pages/SettingsPage.xaml b/BookAStar/BookAStar/Pages/SettingsPage.xaml
index e0984276..9301f215 100644
--- a/BookAStar/BookAStar/Pages/SettingsPage.xaml
+++ b/BookAStar/BookAStar/Pages/SettingsPage.xaml
@@ -30,9 +30,10 @@ BindingContext="." >
         <ListView.ItemTemplate HeightRequest="60" VerticalOptions="StartAndExpand">
           <DataTemplate>
             <ViewCell>
-                <Grid Padding="0"
+                <Grid Padding="5"
                           ColumnSpacing="10"
-                          RowSpacing="0">
+                          RowSpacing="2">
+                  <Image Source="{Binding Avatar}" HeightRequest="80" />
                   <Label Grid.Column="0" Text="{Binding UserName}" />
                 </Grid>
             </ViewCell>
@@ -42,10 +43,18 @@ BindingContext="." >
 
       </ListView>
       
+  
+  
       <StackLayout Orientation="Horizontal" VerticalOptions="Start">
-        <Label Text="Recevoir les notifications push" StyleClass="Header"/>
+        <Label Text="Recevoir les notifications push" />
         <Switch x:Name="pushstatus" />
       </StackLayout>
+
+  <StackLayout Orientation="Horizontal">
+    <Label Text="Utiliser ma position" />
+    <Switch x:Name="use_my_pos" HorizontalOptions="End" />
+  </StackLayout>
+  
   
   <StackLayout Orientation="Horizontal" VerticalOptions="Start">
     <Label Text="Recevoir les demandes de devis de la part de professionnels uniquement"
@@ -53,6 +62,5 @@ BindingContext="." >
     <Switch x:Name="restrictToPro" />
   </StackLayout>
 
-  <Button x:Name="BtnViewDeviceInfo" Text="Device info" StyleClass="Info"></Button>
 </StackLayout>
 </ContentPage>
diff --git a/BookAStar/BookAStar/Pages/SettingsPage.xaml.cs b/BookAStar/BookAStar/Pages/SettingsPage.xaml.cs
index d1ad3c51..1a47a79b 100644
--- a/BookAStar/BookAStar/Pages/SettingsPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/SettingsPage.xaml.cs
@@ -33,13 +33,7 @@ namespace BookAStar
             AccountListView.ItemSelected += Accounts_ItemSelected;
            
             pushstatus.Toggled += Pushstatus_Toggled;
-
-            BtnViewDeviceInfo.Clicked += BtnDeviceInfo_Clicked;
-        }
-
-        private void BtnDeviceInfo_Clicked(object sender, EventArgs e)
-        {
-           ((BookAStar.App) App.Current).ShowDeviceInfo();
+            
         }
 
         protected void Pushstatus_Toggled(object sender, ToggledEventArgs e)
@@ -64,7 +58,7 @@ namespace BookAStar
             var doIt = await Confirm("Suppression de l'identification",
                 $"Vous êtes sur le point de supprimer votre identification pour ce compte : {user.UserName}\nContinuer ?");
             if (doIt)
-                App.PlateformSpecificInstance.RevokeAccount(user.UserName);
+                App.PlatformSpecificInstance.RevokeAccount(user.UserName);
         }
 
         async Task<bool> Confirm(string title, string procedure)
@@ -84,7 +78,7 @@ namespace BookAStar
 
         private void AddAccountBtn_Clicked(object sender, EventArgs e)
         {
-            App.PlateformSpecificInstance.AddAccount();
+            App.PlatformSpecificInstance.AddAccount();
         }
 
        
diff --git a/BookAStar/BookAStar/Properties/AssemblyInfo.cs b/BookAStar/BookAStar/Properties/AssemblyInfo.cs
index 076d24fe..dcb0c729 100644
--- a/BookAStar/BookAStar/Properties/AssemblyInfo.cs
+++ b/BookAStar/BookAStar/Properties/AssemblyInfo.cs
@@ -9,11 +9,11 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("BookAStar")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Paul Schneider")]
 [assembly: AssemblyProduct("BookAStar")]
 [assembly: AssemblyCopyright("Copyright © Paul Albert Schneider 2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTrademark("Yavsc")]
+[assembly: AssemblyCulture("fr")]
 [assembly: NeutralResourcesLanguage("fr")]
 
 // Version information for an assembly consists of the following four values:
diff --git a/BookAStar/BookAStar/Views/MarkdownView.cs b/BookAStar/BookAStar/Views/MarkdownView.cs
index 0ede50ea..b00195ac 100644
--- a/BookAStar/BookAStar/Views/MarkdownView.cs
+++ b/BookAStar/BookAStar/Views/MarkdownView.cs
@@ -1,14 +1,15 @@
-using System;
+using BookAStar.Interfaces;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection.Emit;
 using System.Text;
 
 using Xamarin.Forms;
-          
+
 namespace BookAStar.Views
 {
-    public partial class MarkdownView : ContentView
+    public class MarkdownView : View
     {
         public static readonly BindableProperty MarkdownProperty = BindableProperty.Create(
             "Markdown", typeof(string), typeof(MarkdownView), null, BindingMode.TwoWay
@@ -23,25 +24,20 @@ namespace BookAStar.Views
                 return markdown;
             }
             set {
-                markdown = value;
-                Content = App.PlateformSpecificInstance.CreateMarkdownView(
-                    markdown,
-                    e => {
-                        Markdown = e;
-                        if (Validated != null)
-                            Validated.Invoke(this, new EventArgs());
+                if (markdown != value)
+                    if (Edited != null)
+                    {
+                        markdown = value;
+                        Edited.Invoke(this, new EventArgs());
+                        return;
                     }
-                    );
-
+                
+                markdown = value;
             }
         }
-
-        public MarkdownView() : base()
-        {
-            
-        }
-
-        public event EventHandler Validated;
-
+        
+        public event EventHandler<EventArgs> Edited;
+        
     }
+
 }
diff --git a/BookAStar/BookAStar/icon-anon.png b/BookAStar/BookAStar/icon-anon.png
new file mode 100644
index 0000000000000000000000000000000000000000..38d6db946724a8c9a2bac8cd7d2a08d7e1bacaac
GIT binary patch
literal 1031
zcmV+i1o-=jP)<h;3K|Lk000e1NJLTq001BW0018d1ONa4EMEr)00002VoOIv0RM-N
z%)bBt010qNS#tmY3J3rI3J3vb2*g<c000McNliru;0YA~85}=GfvErh1DHufK~y-)
zg_T=qTvZf?zkknUCUIg~k~C>*YZ{1Bi=>U_!P|?qRLwLcD)yli#Gs-tQVEEt2#O%0
zNCd$f7Fw(LWWh8=TT+Bl+otJD2-Gw}bFq<FJ7zLYbD5d5d^nTL$xO8C<#1U4`uDo+
ze~VIcY@&v0w$Mx!kYbcyNpPJ>JZ@@RIl_LLs3nHW6UL~eiT!-d)?&C;{H@^yV!Vz0
z2f5=d(tOFx>h4y0sk>>0b@bA@nxlnJg1?Ufu*W?XS_RufOKIhYg5`7okMHO>6h9Nc
z5I-J&6`(y>_+jn}_MnQ-*casMDEHn~x8>ai<F@zsz;2EeAm8#Lvr7aobCk(~FOD5m
zCzcPFJmg)|y?wt2&e+70d<+g~W<xL>><;b3lOUr-<&ca}9q+6tW0LhW`xzYOCDK8H
z_GfiaHZQT=$~DcfRbxnV75(!8*e!g@GhrGyzcL(Lml5G9dq8PH1(P~R%8clJ{2YMY
zV1R}&)toLKiQNg6YUB%k!(%5q=(Nuj!y1c#r>SwQAyG1Ci6kE|L>A)+Gi*@>2E{w^
zH&u>GG9~e&Mh-_52b8g%zbpgTl_KCGw>oZPp`?WG0Aygm0a6@O$V6_i2)MuoN98J4
zbQolkvA{lB_>mF9@)9RfML3U2N0QQQAK_2K%;O2}<{SFWVW_7B7b5AnN~Gl0Ub8VI
zMXi}>hN(av8Gb4uh;Y@BChD(m!Fn_L9x$gEQNKcQxo@C=*zJF!q{AesVd81huD#5K
zZ7tii%UZM<AZsV(EwyN4{1j(7p-c7;S+aOQ4N0+%=Xfvv1`pFjJ+b90YC_rwOd6Qs
zmSrl*w8rdI-}}7AR{}oV)g8f1hVw6<A<U$Ry`mgFWD5f}VPGa{fs-H6?SMB&<}iU1
zLNb%TjF_&I2neK^ge086F3<D2znt03)Vj_HAPh;%%9LS{i+Fi)&XeX<BBjyiGZ&Wx
zr7ZT#BW<3U1;edWybYO|NlyJ2(hrg;$a;9~)cv)gWw=Sj>y7*d2+MIcF;h>@S9;&F
zGuzIOI|=jq=(lP)6GNCVL!LA+G1KCQuY6cSWrGiGi}`_m29kk)t{Em!nlnR-ZH2+O
z06{Ku&$+Il*|aNPYJef~Nnz#Oa6_qcU5l-OxuVscjmAAq_2G(;90ClFoMq>(OppJ-
zf&YISm#iv$d-djUgSA-$(v$|Xe<a4T6U>%E{{_x7U>*AxW0e2^002ovPDHLkV1oC>
B*){+G

literal 0
HcmV?d00001