From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 28 Sep 2018 13:24:35 +0000 (+0000)
Subject: #2208
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a2bdae7625e49e4fec035d31c6d3a8608a1465e5;p=cubeextranet.git

#2208
---

diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml
index 40e086639..2a46a24d4 100644
--- a/fluidbook/tools/fwstk/.idea/workspace.xml
+++ b/fluidbook/tools/fwstk/.idea/workspace.xml
@@ -6,7 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="" />
+    <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="fix #2243 @0:40" />
     <ignored path="fwstk.iws" />
     <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/bin/" />
@@ -24,9 +24,32 @@
     <session id="-183392587">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="1" />
+          <entry key="project.closed" value="2" />
+          <entry key="project.open.time.1" value="1" />
           <entry key="project.open.time.2" value="1" />
-          <entry key="project.opened" value="1" />
+          <entry key="project.opened" value="2" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.open">
+        <counts>
+          <entry key="java" value="11" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.open">
+        <counts>
+          <entry key="JAVA" value="11" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="7" />
+          <entry key="txt" value="15" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="7" />
+          <entry key="PLAIN_TEXT" value="15" />
         </counts>
       </usages-collector>
     </session>
@@ -39,8 +62,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="850">
-              <caret line="64" column="23" selection-start-line="64" selection-start-column="23" selection-end-line="64" selection-end-column="23" />
+            <state relative-caret-position="748">
+              <caret line="64" column="22" selection-start-line="64" selection-start-column="22" selection-end-line="64" selection-end-column="22" />
             </state>
           </provider>
         </entry>
@@ -48,7 +71,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3536">
+            <state relative-caret-position="-9717">
               <caret line="250" column="32" selection-start-line="250" selection-start-column="32" selection-end-line="250" selection-end-column="32" />
             </state>
           </provider>
@@ -57,76 +80,83 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1785">
-              <caret line="130" column="5" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
+            <state relative-caret-position="833">
+              <caret line="80" column="16" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.idea/libraries/commons_lang3_3_7.xml">
-          <provider selected="true" editor-type-id="text-editor" />
+        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutElement.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="238">
+              <caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
+            </state>
+          </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java">
+        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Letter.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="313">
-              <caret line="27" column="50" selection-start-line="27" selection-start-column="50" selection-end-line="27" selection-end-column="50" />
+            <state relative-caret-position="1547">
+              <caret line="102" column="19" selection-start-line="102" selection-start-column="19" selection-end-line="102" selection-end-column="19" />
+              <folding>
+                <element signature="e#1852#1853#0" expanded="true" />
+                <element signature="e#1871#1872#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Separator.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="187">
-              <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+            <state relative-caret-position="348">
+              <caret line="105" column="52" selection-start-line="105" selection-start-column="52" selection-end-line="105" selection-end-column="52" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#2325#2326#0" expanded="true" />
+                <element signature="e#2382#2383#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/org/apache/pdfbox/util/PDFTextStripper.java">
+        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5151">
-              <caret line="345" column="32" selection-start-line="345" selection-start-column="15" selection-end-line="345" selection-end-column="32" />
+            <state relative-caret-position="833">
+              <caret line="52" column="19" selection-start-line="52" selection-start-column="19" selection-end-line="52" selection-end-column="19" />
               <folding>
-                <element signature="e#51764#51765#0" expanded="true" />
-                <element signature="e#51820#51821#0" expanded="true" />
-                <element signature="e#59179#59180#0" expanded="true" />
-                <element signature="e#59223#59224#0" expanded="true" />
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/TextsThread.java">
+        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Word.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3145">
-              <caret line="196" column="61" selection-start-line="196" selection-start-column="61" selection-end-line="196" selection-end-column="61" />
+            <state relative-caret-position="51">
+              <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java">
+        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="867">
-              <caret line="61" column="34" selection-start-line="61" selection-start-column="34" selection-end-line="61" selection-end-column="34" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="416">
+              <caret line="80" column="53" selection-start-line="80" selection-start-column="53" selection-end-line="80" selection-end-column="53" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/cube/util/StringUtil.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="663">
-              <caret line="47" column="25" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
+            <state relative-caret-position="336">
+              <caret line="59" selection-start-line="59" selection-end-line="59" />
             </state>
           </provider>
         </entry>
@@ -189,7 +219,6 @@
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutElement.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/Link.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java" />
-        <option value="$PROJECT_DIR$/src/cube/util/StringUtil.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java" />
         <option value="$PROJECT_DIR$/MANIFEST.MF" />
@@ -203,6 +232,7 @@
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java" />
+        <option value="$PROJECT_DIR$/src/cube/util/StringUtil.java" />
       </list>
     </option>
   </component>
@@ -215,7 +245,7 @@
   <component name="PhpServers">
     <servers />
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-1928" />
     <option name="y" value="-8" />
     <option name="width" value="1936" />
@@ -298,6 +328,13 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="fwstk" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="fwstk" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="fwstk" type="462c0819:PsiDirectoryNode" />
+              <item name="geom" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
               <item name="fwstk" type="462c0819:PsiDirectoryNode" />
@@ -319,9 +356,9 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -700,6 +737,7 @@
       <workItem from="1522337389921" duration="866000" />
       <workItem from="1530632372632" duration="1612000" />
       <workItem from="1536915422503" duration="1202000" />
+      <workItem from="1536936327997" duration="1627000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>
@@ -750,11 +788,18 @@
       <option name="project" value="LOCAL" />
       <updated>1515508995835</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="fix #2243 @0:40">
+      <created>1536937362634</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1536937362634</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="78105000" />
+    <option name="totallyTimeSpent" value="79732000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -766,9 +811,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-1928" y="-8" width="1936" height="1176" extended-state="7" />
+    <frame x="-1928" y="-8" width="1936" height="1176" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1641791" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16577825" />
       <window_info id="Palette&#9;" order="1" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Capture Tool" order="3" />
@@ -786,8 +832,8 @@
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="9" weight="0.32934782" />
       <window_info anchor="bottom" id="Terminal" order="10" weight="0.32934782" />
-      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.48720682" weight="0.32755297" />
-      <window_info anchor="bottom" id="File Transfer" order="12" visible="true" weight="0.32851636" />
+      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.48720682" weight="0.32660902" />
+      <window_info anchor="bottom" id="File Transfer" order="12" visible="true" weight="0.32756963" />
       <window_info anchor="right" id="SciView" order="0" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="1" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="2" weight="0.25" />
@@ -826,7 +872,8 @@
     <MESSAGE value="#811" />
     <MESSAGE value="fix #1629 @3" />
     <MESSAGE value="wait #1866 @6" />
-    <option name="LAST_COMMIT_MESSAGE" value="wait #1866 @6" />
+    <MESSAGE value="fix #2243 @0:40" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix #2243 @0:40" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -935,13 +982,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutElement.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_152/src.zip!/java/lang/Object.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="197">
@@ -949,20 +989,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/cube/util/StringUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1054">
-          <caret line="73" column="25" selection-start-line="73" selection-start-column="25" selection-end-line="73" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Letter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="25" column="47" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Space.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="153">
@@ -984,64 +1010,105 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java">
+    <entry file="file://$PROJECT_DIR$/.idea/libraries/commons_lang3_3_7.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/org/apache/pdfbox/util/PDFTextStripper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="24" column="97" selection-start-line="24" selection-start-column="97" selection-end-line="24" selection-end-column="97" />
+        <state relative-caret-position="5151">
+          <caret line="345" column="32" selection-start-line="345" selection-start-column="15" selection-end-line="345" selection-end-column="32" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#51764#51765#0" expanded="true" />
+            <element signature="e#51820#51821#0" expanded="true" />
+            <element signature="e#59179#59180#0" expanded="true" />
+            <element signature="e#59223#59224#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java">
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Separator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="136">
+          <caret line="12" column="25" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="27" column="50" selection-start-line="27" selection-start-column="50" selection-end-line="27" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/TextsThread.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="850">
-          <caret line="64" column="23" selection-start-line="64" selection-start-column="23" selection-end-line="64" selection-end-column="23" />
+        <state relative-caret-position="3145">
+          <caret line="196" column="61" selection-start-line="196" selection-start-column="61" selection-end-line="196" selection-end-column="61" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Word.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="51">
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3536">
+        <state relative-caret-position="-9717">
           <caret line="250" column="32" selection-start-line="250" selection-start-column="32" selection-end-line="250" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java">
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1785">
-          <caret line="130" column="5" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
+        <state relative-caret-position="348">
+          <caret line="105" column="52" selection-start-line="105" selection-start-column="52" selection-end-line="105" selection-end-column="52" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#2325#2326#0" expanded="true" />
+            <element signature="e#2382#2383#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.idea/libraries/commons_lang3_3_7.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/org/apache/pdfbox/util/PDFTextStripper.java">
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Letter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5151">
-          <caret line="345" column="32" selection-start-line="345" selection-start-column="15" selection-end-line="345" selection-end-column="32" />
+        <state relative-caret-position="1547">
+          <caret line="102" column="19" selection-start-line="102" selection-start-column="19" selection-end-line="102" selection-end-column="19" />
           <folding>
-            <element signature="e#51764#51765#0" expanded="true" />
-            <element signature="e#51820#51821#0" expanded="true" />
-            <element signature="e#59179#59180#0" expanded="true" />
-            <element signature="e#59223#59224#0" expanded="true" />
+            <element signature="e#1852#1853#0" expanded="true" />
+            <element signature="e#1871#1872#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/TextsThread.java">
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutElement.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3145">
-          <caret line="196" column="61" selection-start-line="196" selection-start-column="61" selection-end-line="196" selection-end-column="61" />
+        <state relative-caret-position="238">
+          <caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="748">
+          <caret line="64" column="22" selection-start-line="64" selection-start-column="22" selection-end-line="64" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="833">
+          <caret line="80" column="16" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="867">
-          <caret line="61" column="34" selection-start-line="61" selection-start-column="34" selection-end-line="61" selection-end-column="34" />
+        <state relative-caret-position="833">
+          <caret line="52" column="19" selection-start-line="52" selection-start-column="19" selection-end-line="52" selection-end-column="19" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -1050,22 +1117,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="663">
-          <caret line="47" column="25" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
+        <state relative-caret-position="416">
+          <caret line="80" column="53" selection-start-line="80" selection-start-column="53" selection-end-line="80" selection-end-column="53" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="313">
-          <caret line="27" column="50" selection-start-line="27" selection-start-column="50" selection-end-line="27" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Separator.java">
+    <entry file="file://$PROJECT_DIR$/src/cube/util/StringUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="336">
+          <caret line="59" selection-start-line="59" selection-end-line="59" />
         </state>
       </provider>
     </entry>
diff --git a/inc/extranet/Controlleur/class.extranet.page.chiffres.php b/inc/extranet/Controlleur/class.extranet.page.chiffres.php
index e912b8334..0f01f1f79 100644
--- a/inc/extranet/Controlleur/class.extranet.page.chiffres.php
+++ b/inc/extranet/Controlleur/class.extranet.page.chiffres.php
@@ -511,8 +511,8 @@ class extranetPageChiffres {
 		$res .= '<tr><td><strong>' . __('Total') . '</strong></td>';
 		foreach ($annees as $annee) {
 			if (isset($total_annee[$annee])) {
-				$c = $total_consomme_annee[$annee];
-				$p = $total_prevu_annee[$annee];
+				//$c = $total_consomme_annee[$annee];
+				//$p = $total_prevu_annee[$annee];
 				$res .= '<td><strong>' . self::format($total_annee[$annee], true) . '</strong></td>';
 			}
 		}
diff --git a/inc/prepend.php b/inc/prepend.php
index 6d17a88dd..321941083 100644
--- a/inc/prepend.php
+++ b/inc/prepend.php
@@ -69,5 +69,4 @@ if (isset($_POST['q'])) {
 	$_SESSION['q'] = $_POST['q'] ? $_POST['q'] : null;
 } elseif (!isset($_SERVER['HTTP_X_REQUESTED_WITH']) || $_SERVER['HTTP_X_REQUESTED_WITH'] != 'XMLHttpRequest') {
 	$_SESSION['q'] = null;
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index a8262dfb6..d0ec37ac2 100644
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -1042,9 +1042,11 @@ class wsMaintenance
 		foreach ($dirs as $dir) {
 			cubeFiles::scanRecursiveDir($dir, $files);
 			$limit = TIME - 7200;
-			foreach ($files as $f) {
-				if (filemtime($f) < $limit) {
-					unlink($f);
+			if(is_array($files)) {
+				foreach ($files as $f) {
+					if (filemtime($f) < $limit) {
+						unlink($f);
+					}
 				}
 			}
 		}
diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 8127632c6..9a798d35d 100644
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -1192,7 +1192,7 @@ class wsServices extends cubeFlashGateway
 				$c = $core->con->openCursor('bourbon_suggestions');
 				$c->type = $parts[2];
 				$c->suggestion = $parts[3];
-				$c->date = round($parts[1]/1000);
+				$c->date = round($parts[1] / 1000);
 				$c->from = $from;
 				$c->page = $parts[0];
 				$c->insert();
@@ -1269,4 +1269,32 @@ class wsServices extends cubeFlashGateway
 		exit;
 
 	}
+
+	public static function subscribe()
+	{
+		if (isset($_POST['form'])) {
+			switch ($_POST['form']) {
+				case 'avery':
+					self::_subscribeAvery();
+					break;
+				default:
+					break;
+			}
+		}
+	}
+
+	public static function _subscribeAvery()
+	{
+		$api = new CubeIT_Services_Mailchimp('5d00b7e601cf1948cb95de06630878ae-us19');
+		$data = [
+			'email' => $_POST['email'],
+			'COMPANY' => $_POST['company'],
+			'ACTIVITY' => $_POST['activity'],
+			'COUNTRY' => $_POST['country'],
+			'OPTIN' => $_POST['subscribe'],
+			'LANGUAGE' => $_POST['locale']
+		];
+		$api->subscribe('33699982ca', $data);
+
+	}
 }
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 1cbc1fdd8..c42836f17 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -2195,7 +2195,7 @@ html{height:100%}' . "\n";
 
 		try {
 			$client = new Zend_Http_Client();
-			$client->setAdapter('Zend_Http_Client_Adapter_Curl');
+			$client->setAdapter('Zend_Http_Client_Adapter_Socket');
 			$client->setEncType(Zend_Http_Client::ENC_FORMDATA);
 			$client->setMethod(Zend_Http_Client::POST);
 			$client->setParameterPost(array('reference' => $ref));
@@ -2227,5 +2227,4 @@ html{height:100%}' . "\n";
 		}
 		die('');
 	}
-
 }
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 724f42c18..1f9563f9c 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -392,7 +392,13 @@ class wsBookParametres extends wsParametres
 		$this->forms['archives'] = array('label' => __('Archives'),
 			'fieldsnames' => array('externalArchives', 'externalArchivesBack', '|', 'archivesLink', 'archivesLabel'));
 		// .
-		$this->fields['form'] = array('type' => 'combo', 'default' => '', 'editable' => true, 'grade' => 5, 'label' => __('Formulaire'), 'datas' => array(__('Aucun') => '', 'Bulle Groupe' => 'bulle', 'Bourbon / Suggestions' => 'bourbon'));
+		$this->fields['form'] = array('type' => 'combo', 'default' => '', 'editable' => true, 'grade' => 5, 'label' => __('Formulaire'), 'datas' =>
+			array(__('Aucun') => '',
+				'Bulle Groupe' => 'bulle',
+				'Bourbon / Suggestions' => 'bourbon',
+				'Avery' => 'avery',
+			)
+		);
 		$this->forms['form'] = array('label' => __('Formulaire'),
 			'fieldsnames' => array('form'));
 
diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index daeb57853..75b9d96d8 100644
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -983,7 +983,10 @@ class wsDocument extends cubeMetier
 
 	public function resetLog()
 	{
-		unlink($this->log . '/commons.log.gz');
+		$f=$this->log . '/commons.log.gz';
+		if(file_exists($f)) {
+			unlink($f);
+		}
 	}
 
 	public function addToLog($cl, $output = true, $page = null)
diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 95f860a15..09741543b 100644
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -1,6 +1,7 @@
 <?php
 
-class wsExporter {
+class wsExporter
+{
 
 	public $book_id;
 	public $dao;
@@ -17,7 +18,8 @@ class wsExporter {
 
 	const VINCENT = "paris.cubedesigners.com";
 
-	public function exportCollection($collectionId, $os) {
+	public function exportCollection($collectionId, $os)
+	{
 		global $core;
 
 
@@ -75,7 +77,7 @@ class wsExporter {
 			$phonegap->addLibrary(array('from' => WS_COMPILE_ASSETS . '/_html5app/_android/res', 'to' => '/res'));
 			$phonegap->setDistantCompiler(self::VINCENT, 'Vincent', 's77vpo*wu5', 'h:/Phonegap/Projects/' . $d, '/mnt/vincent/cygdrive/h/Phonegap/Projects/' . $d, 22322, SSH_KEY);
 			$phonegap->setSourceVariables(array('background' => '0xff' . $collection->settings['couleurD'],
-			                                    'orientation' => $collection->settings['orientation'])
+					'orientation' => $collection->settings['orientation'])
 			);
 			$phonegap->fileDistantReplaceContents('// PLUGIN GRADLE EXTENSIONS START' . "\r\n" . '// PLUGIN GRADLE EXTENSIONS END',
 				'// PLUGIN GRADLE EXTENSIONS START' . "\r\n" . 'apply from: "fluidbook-dependencies/catalogues-fluidbook.gradle"' . "\r\n" . '// PLUGIN GRADLE EXTENSIONS END',
@@ -156,7 +158,8 @@ class wsExporter {
 	 * @param string $os
 	 * @param wsHTML5AppCompiler $compiler
 	 */
-	protected function _collectionAssets($os, $compiler) {
+	protected function _collectionAssets($os, $compiler)
+	{
 		if ($os == 'ios') {
 			$this->_collectionAssetsIOS($os, $compiler);
 		} else if ($os == 'android') {
@@ -164,12 +167,14 @@ class wsExporter {
 		}
 	}
 
-	protected function _collectionAssetsAndroid($os, $compiler) {
+	protected function _collectionAssetsAndroid($os, $compiler)
+	{
 		$collection = $compiler->collection;
 		$src = $compiler->wdir . '/' . $collection->theme['icon'];
 	}
 
-	protected function _collectionAssetsIOS($os, $compiler) {
+	protected function _collectionAssetsIOS($os, $compiler)
+	{
 		$collection = $compiler->collection;
 		$src = $compiler->wdir . '/' . $collection->theme['icon'];
 		// icones
@@ -222,7 +227,8 @@ class wsExporter {
 		$this->_rsync(WS_COLLECTIONS . '/resources/' . $collection->collection_id . '/' . $os, "/mnt/macbox" . $this->_iosProjectDir($collection->settings['namespace']) . '/' . CubeIT_Text::str2URL($collection->nom) . '/Resources', false);
 	}
 
-	protected function _testFile($ref, $dest) {
+	protected function _testFile($ref, $dest)
+	{
 		if (!file_exists($dest)) {
 			return false;
 		}
@@ -232,7 +238,8 @@ class wsExporter {
 		return true;
 	}
 
-	protected function _createProject($os, $name, $ns) {
+	protected function _createProject($os, $name, $ns)
+	{
 		if ($os == 'ios') {
 			$dir = $this->_iosProjectDir($ns);
 			$sdir = '/mnt/macbox' . $dir;
@@ -254,11 +261,13 @@ class wsExporter {
 		}
 	}
 
-	protected function _iosProjectDir($ns) {
+	protected function _iosProjectDir($ns)
+	{
 		return '/Phonegap/Projects/' . str_replace('.', '/', $ns);
 	}
 
-	protected function _iosPlugin($dir, $plugin) {
+	protected function _iosPlugin($dir, $plugin)
+	{
 		// git@github.com:phonegap-build/PushPlugin.git
 		$cl = new CubeIT_CommandLine('/usr/local/bin/plugman');
 		$cl->setManualArg(' --platform ios');
@@ -268,7 +277,8 @@ class wsExporter {
 		$cl->execute();
 	}
 
-	public function export($book_id, &$x, $action = 'download', $version = 'online', $destinationDir = null, $destinationFile = null) {
+	public function export($book_id, &$x, $action = 'download', $version = 'online', $destinationDir = null, $destinationFile = null)
+	{
 		global $core;
 		set_time_limit(0);
 
@@ -312,12 +322,14 @@ class wsExporter {
 		}
 	}
 
-	protected function _haveToZip() {
+	protected function _haveToZip()
+	{
 		$yes = array('win-exe', 'mac-exe', 'win-cd');
 		return in_array($this->version, $yes);
 	}
 
-	protected function _phonegapcollection() {
+	protected function _phonegapcollection()
+	{
 		$d = '/' . $this->destinationDir;
 
 		$packager = new wsPackagerPhonegap($this->book_id, $d, true, false, $this->version);
@@ -327,7 +339,15 @@ class wsExporter {
 		return $packager->makePackage(false);
 	}
 
-	protected function _install() {
+	protected function _killFtp($book_id){
+		$kill='pkill -f "^lftp(.*)'.$book_id.'"';
+		`$kill`;
+	}
+
+	protected function _install()
+	{
+		$this->_killFtp($this->book_id);
+
 		$p = wsPackager::package($this->book_id, $this->version, $this->_haveToZip(), false);
 
 		if (strpos($p, '/fluidbook') == 0) {
@@ -355,6 +375,7 @@ class wsExporter {
 		}
 
 		if (stristr($path, 'ftp://')) {
+			$this->_killFtp($this->book_id);
 			$this->_lftp($p, $path, $this->ftpPassiveMode);
 		} else {
 			$this->_rsync($p, $path);
@@ -366,7 +387,8 @@ class wsExporter {
 		}
 	}
 
-	protected function _phonegap() {
+	protected function _phonegap()
+	{
 		$os = $this->action;
 
 		if ($this->destinationDir == '') {
@@ -380,7 +402,8 @@ class wsExporter {
 		$this->_transfertPhonegap($os, $package, $this->destinationDir);
 	}
 
-	protected function _transfertPhonegap($os, $package, $destination) {
+	protected function _transfertPhonegap($os, $package, $destination)
+	{
 		if ($os == 'android') {
 			`sudo /usr/local/bin/remountvincent`;
 			$this->_rsync($package, '/mnt/vincent/cygdrive/h/Works/Phonegap/Projects/' . $destination, true);
@@ -390,7 +413,8 @@ class wsExporter {
 		}
 	}
 
-	protected function _lftp($src, $dest, $passive = false, $erase = false) {
+	protected function _lftp($src, $dest, $passive = false, $erase = false)
+	{
 		set_time_limit(0);
 		$u = parse_url($dest);
 
@@ -402,6 +426,9 @@ class wsExporter {
 		} else {
 			$u['dir'] = $u['path'];
 		}
+		if ($u['dir'] == '') {
+			$u['dir'] = '/';
+		}
 
 		$passive = $passive ? 'on' : 'off';
 
@@ -426,6 +453,10 @@ class wsExporter {
 			}
 		}
 
+		if (!file_exists($src)) {
+			return;
+		}
+
 		$lftp = new CubeIT_CommandLine('lftp');
 		$lftp->setArg('u', $u['user'] . ',' . $u['pass']);
 		$lftp->setArg('p', $u['port']);
@@ -435,7 +466,8 @@ class wsExporter {
 		$lftp->debug();
 	}
 
-	protected function _rsync($src, $dest, $erase = false, $chown = null) {
+	protected function _rsync($src, $dest, $erase = false, $chown = null)
+	{
 		set_time_limit(0);
 		/*if (is_file($src)) {
 			$dir = dirname($dest);
@@ -457,12 +489,14 @@ class wsExporter {
 		}
 	}
 
-	protected function _download() {
+	protected function _download()
+	{
 		$r = wsPackager::package($this->book_id, $this->version);
 		$this->x->addRedirection($r);
 	}
 
-	protected function _getVersion($version) {
+	protected function _getVersion($version)
+	{
 		if ($version == 'v2') {
 			return 'html';
 		} else if ($version == 'online') {
@@ -475,7 +509,8 @@ class wsExporter {
 		return $version;
 	}
 
-	protected function _saveDestination() {
+	protected function _saveDestination()
+	{
 		$datas = $this->book->exportdatas;
 		if ($datas == '') {
 			$datas = array();
diff --git a/inc/ws/Util/class.ws.tools.php b/inc/ws/Util/class.ws.tools.php
index 597656dd2..9526374dc 100644
--- a/inc/ws/Util/class.ws.tools.php
+++ b/inc/ws/Util/class.ws.tools.php
@@ -160,20 +160,6 @@ class wsTools {
 			$cleanerexpired ||
 			$originalexpired;
 
-		if ($force) {
-			trigger_error('optimizeSVG forced');
-		}
-		if ($notexists) {
-			trigger_error('optimizeSVG not exists');
-		}
-		if ($cleanerexpired) {
-			trigger_error('optimizeSVG cleaner expired');
-		}
-		if ($originalexpired) {
-			trigger_error('optimizeSVG original expired');
-		}
-
-
 		if ($optimize) {
 			$cmd = "timeout -s 1 20 /usr/local/bin/svgcleaner --allow-bigger-file --paths-coordinates-precision 3 --copy-on-error --stdout $original";
 			$svg = `$cmd`;
diff --git a/inc/ws/Util/class.ws.util.php b/inc/ws/Util/class.ws.util.php
index 0e7a694e4..7e4b267be 100644
--- a/inc/ws/Util/class.ws.util.php
+++ b/inc/ws/Util/class.ws.util.php
@@ -158,7 +158,7 @@ class wsUtil
 				$invalid = false;
 				foreach ($pages as $i => $infos) {
 					$doc = wsDocument::getDir($infos['document_id']) . 'crop.pdf';
-					if (filemtime($doc) > $fmtime) {
+					if (file_exists($doc) && filemtime($doc) > $fmtime) {
 						$invalid = true;
 					}
 				}
diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index e60ebce3e..2c06ad7af 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -7,6 +7,7 @@ class wsHTML5Compiler
 	public $jsFiles = array(
 		'js/libs/modernizr/modernizr.min.js',
 		'js/libs/modernizr/tests.js',
+		'js/libs/cookie.min.js',
 		'js/libs/cube/fb.js',
 		'js/libs/cube/util.js',
 		'js/libs/screenfull.min.js',
@@ -266,6 +267,91 @@ class wsHTML5Compiler
 		$this->config->vectorPages = array_diff(cubeArray::parseRange($this->config->vectorPages), $this->config->rasterizePages);
 	}
 
+	protected function populateConfig()
+	{
+		$this->config->numerotation = explode(',', $this->book->numerotation);
+		$this->config->id = $this->book->book_id;
+		$this->config->cid = $this->book->cid;
+		$this->config->cacheDate = TIME;
+		$this->config->width = $this->cssWidth;
+		$this->config->height = $this->cssHeight;
+		$this->config->optimalWidth = $this->optimalWidth;
+		$this->config->optimalHeight = $this->optimalHeight;
+		$this->config->chapters = $this->book->chapters;
+		$this->config->videoFormats = $this->getVideosFormats(false);
+		$this->config->htmlmultimedia = $this->htmlmultimedia;
+		$this->config->phonegap = $this->phonegap;
+		$this->config->retinaResolution = min($this->book->parametres->maxResolution, $this->maxRes);
+		$this->config->pageLabels = $this->pageLabels;
+		$this->config->pageZoomFactor = $this->z;
+		$this->config->multiply = $this->multiply;
+		$this->config->cssScale = $this->cssScale;
+		$this->config->pdfZoomFactor = $this->pdf2htmlRatio;
+		if ($this->home) {
+			$this->config->home = 'http://home';
+		}
+		$this->config->multiApp = $this->multiApp;
+		foreach ($this->additionalConfig as $k => $v) {
+			$this->config->$k = $v;
+		}
+		if ($this->phonegap && ($this->book->parametres->offlineLink == '' || $this->book->parametres->offlineLink == 'http://')) {
+			$this->config->share = false;
+		}
+
+		// We need to be able to reference both navOrder and navOrderH so convert both to arrays
+		// We also make sure there are no empty items in the arrays (see: http://php.net/manual/en/function.array-filter.php#111091)
+		$this->config->navOrder = array_filter(array_map('trim', explode(',', $this->config->navOrder)), 'strlen');
+		$this->config->navOrderH = array_filter(array_map('trim', explode(',', $this->config->navOrderH)), 'strlen');
+
+		$this->config->standalone = $this->standalone;
+		if ($this->config->phonegap) {
+			$this->config->manifest = $this->writeManifest();
+		}
+
+		if ($this->config->form == 'bulle') {
+			$this->addJs('js/libs/fluidbook/forms/fluidbook.form.bulle.js');
+		} else if ($this->config->form == 'bourbon') {
+			$this->addJs('js/libs/parsley.min.js');
+			$this->addJs('js/libs/fluidbook/forms/fluidbook.form.bourbon.js');
+		} else if ($this->config->form == 'avery') {
+			$this->addJs('js/libs/parsley.min.js');
+			$this->addJs('js/libs/fluidbook/forms/fluidbook.form.avery.js');
+			$this->addLess('form/avery');
+			$this->writeCountries();
+		}
+
+		if ($this->config->basket) {
+			$this->addJs('js/libs/fluidbook/fluidbook.cart.js');
+			switch ($this->config->basketManager) {
+				case 'Remarkable':
+					$this->addJs('js/libs/parsley.min.js');
+					$this->addJs('js/libs/jquery/jquery.cookie.js');
+					$this->addJs('js/libs/fluidbook/cart/fluidbook.cart.remarkable.js');
+					break;
+				default:
+					break;
+			}
+
+			if (file_exists($this->config->basketReferences) || CubeIT_Util_Url::isDistant($this->config->basketReferences)) {
+				$referencesFile = $this->config->basketReferences;
+			} else {
+				$referencesFile = $this->wdir . '/commerce/' . $this->config->basketReferences;
+			}
+
+			if (file_exists($referencesFile) || CubeIT_Util_Url::isDistant($referencesFile)) {
+				$ext = CubeIT_Files::getExtension($referencesFile);
+				if ($ext == 'xlsx') {
+					$this->config->basketReferences = wsUtil::excelToArray($referencesFile);
+					if ($this->book->parametres->customLinkClass == 'AtlanticDownloadLink') {
+						$this->config->basketReferences = wsUtil::atlanticReferences($this->config->basketReferences, 'local/', array($this, 'log'), array($this->vdir, "copy"));
+					}
+				}
+				$this->log("Done cart references");
+			}
+		}
+		$this->config->seoArticles = $this->seoArticles;
+	}
+
 	public function log($step)
 	{
 		$currenttime = microtime(true);
@@ -369,18 +455,10 @@ class wsHTML5Compiler
 		$this->log('Images written');
 		$linksCSS = $this->writeLinks();
 		$this->log('Links written');
-		$this->writeCSS('data/style/style_%d.css', $linksCSS);
-		$this->log('CSS written');
 		$this->writeLangs();
 		$this->log('Langs written');
 		$this->writeSEO();
 		$this->log('SEO written');
-		$this->writeIndex();
-		$this->log('Index written');
-		if ($this->book->parametres->scorm_enable) {
-			$this->writeScorm();
-			$this->log('SCORM written');
-		}
 		$this->writeWidget();
 		$this->log('Widget written');
 		$this->writeSounds();
@@ -389,6 +467,15 @@ class wsHTML5Compiler
 		$this->log('Texts written');
 		$this->writeExtras();
 		$this->log('Extras written');
+		$this->populateConfig();
+		$this->writeCSS('data/style/style_%d.css', $linksCSS);
+		$this->log('CSS written');
+		$this->writeIndex();
+		$this->log('Index written');
+		if ($this->book->parametres->scorm_enable) {
+			$this->writeScorm();
+			$this->log('SCORM written');
+		}
 		$this->writeJs();
 		$this->log('Js written');
 		$this->vdir->sync($delete);
@@ -469,8 +556,7 @@ class wsHTML5Compiler
 	/**
 	 * Helper function to add a unique stylesheet entry to the LESS stack for compilation
 	 * Duplicate paths are ignored.
-	 * @param $path The path of the file relative to the /style folder, without any extension
-	 * @param $extra_files Optional array of extra files that should be copied across for use during LESS compilation
+	 * @param $path string The path of the file relative to the /style folder, without any extension
 	 */
 	public function addLess($path)
 	{
@@ -801,7 +887,7 @@ class wsHTML5Compiler
 		$lang = $daoLang->selectById($this->book->lang);
 		$langs = $daoLang->selectAll();
 
-		$traductions = (!count($this->book->traductions)) ? $lang->traductions : $this->book->traductions;
+		$traductions = (!is_countable($this->book->traductions) || !count($this->book->traductions)) ? $lang->traductions : $this->book->traductions;
 
 		$this->config->l10n = array();
 		$this->config->l10n['default'] = $traductions;
@@ -1090,7 +1176,9 @@ class wsHTML5Compiler
 				$tmp = cubeFiles::tempnam();
 				file_put_contents($tmp, $js);
 
-				unlink($minimized);
+				if (file_exists($minimized)) {
+					unlink($minimized);
+				}
 
 				$uglify = new CubeIT_CommandLine('/usr/local/bin/uglifyjs');
 				$uglify->setArg('o', $minimized);
@@ -1138,87 +1226,16 @@ class wsHTML5Compiler
 
 	protected function writeConfig()
 	{
-		$this->config->numerotation = explode(',', $this->book->numerotation);
-		$this->config->id = $this->book->book_id;
-		$this->config->cid = $this->book->cid;
-		$this->config->cacheDate = TIME;
-		$this->config->width = $this->cssWidth;
-		$this->config->height = $this->cssHeight;
-		$this->config->optimalWidth = $this->optimalWidth;
-		$this->config->optimalHeight = $this->optimalHeight;
-		$this->config->chapters = $this->book->chapters;
-		$this->config->videoFormats = $this->getVideosFormats(false);
-		$this->config->htmlmultimedia = $this->htmlmultimedia;
-		$this->config->phonegap = $this->phonegap;
-		$this->config->retinaResolution = min($this->book->parametres->maxResolution, $this->maxRes);
-		$this->config->pageLabels = $this->pageLabels;
-		$this->config->pageZoomFactor = $this->z;
-		$this->config->multiply = $this->multiply;
-		$this->config->cssScale = $this->cssScale;
-		$this->config->pdfZoomFactor = $this->pdf2htmlRatio;
-		if ($this->home) {
-			$this->config->home = 'http://home';
-		}
-		$this->config->multiApp = $this->multiApp;
-		foreach ($this->additionalConfig as $k => $v) {
-			$this->config->$k = $v;
-		}
-		if ($this->phonegap && ($this->book->parametres->offlineLink == '' || $this->book->parametres->offlineLink == 'http://')) {
-			$this->config->share = false;
-		}
-
-		// We need to be able to reference both navOrder and navOrderH so convert both to arrays
-		// We also make sure there are no empty items in the arrays (see: http://php.net/manual/en/function.array-filter.php#111091)
-		$this->config->navOrder = array_filter(array_map('trim', explode(',', $this->config->navOrder)), 'strlen');
-		$this->config->navOrderH = array_filter(array_map('trim', explode(',', $this->config->navOrderH)), 'strlen');
-
-		$this->config->standalone = $this->standalone;
-		if ($this->config->phonegap) {
-			$this->config->manifest = $this->writeManifest();
-		}
-
-		if ($this->config->form == 'bulle') {
-			$this->addJs('js/libs/fluidbook/forms/fluidbook.form.bulle.js');
-		} else if ($this->config->form == 'bourbon') {
-			$this->addJs('js/libs/parsley.min.js');
-			$this->addJs('js/libs/fluidbook/forms/fluidbook.form.bourbon.js');
-		}
-
-		if ($this->config->basket) {
-			$this->addJs('js/libs/fluidbook/fluidbook.cart.js');
-			switch ($this->config->basketManager) {
-				case 'Remarkable':
-					$this->addJs('js/libs/parsley.min.js');
-					$this->addJs('js/libs/jquery/jquery.cookie.js');
-					$this->addJs('js/libs/fluidbook/cart/fluidbook.cart.remarkable.js');
-					break;
-				default:
-					break;
-			}
-
-
-			if (file_exists($this->config->basketReferences) || CubeIT_Util_Url::isDistant($this->config->basketReferences)) {
-				$referencesFile = $this->config->basketReferences;
-			} else {
-				$referencesFile = $this->wdir . '/commerce/' . $this->config->basketReferences;
-			}
-
-			if (file_exists($referencesFile) || CubeIT_Util_Url::isDistant($referencesFile)) {
-				$ext = CubeIT_Files::getExtension($referencesFile);
-				if ($ext == 'xlsx') {
-					$this->config->basketReferences = wsUtil::excelToArray($referencesFile);
-					if ($this->book->parametres->customLinkClass == 'AtlanticDownloadLink') {
-						$this->config->basketReferences = wsUtil::atlanticReferences($this->config->basketReferences, 'local/', array($this, 'log'), array($this->vdir, "copy"));
-					}
-				}
-				$this->log("Done cart references");
-			}
-		}
-		$this->config->seoArticles = $this->seoArticles;
-
 		return 'var DATAS=' . json_encode($this->config) . ';' . "\n";
 	}
 
+	protected function writeCountries()
+	{
+		$c = Zend_Locale::getTranslationList('Territory', $this->book->lang, 2);
+		asort($c);
+		$this->config->countries = $c;
+	}
+
 	protected function writeManifest()
 	{
 		$res = array();
@@ -1647,6 +1664,7 @@ class wsHTML5Compiler
 			$destination_css = $tmp . '/' . $f . '.css';
 
 			if (!file_exists($source_less)) {
+				die($source_less);
 				continue;
 			}
 
@@ -1664,7 +1682,7 @@ class wsHTML5Compiler
 			$less->execute();
 			$less->debug();
 			if (!file_exists($destination_css)) {
-				die($less->output);
+				continue;
 			}
 			$this->vdir->copy($destination_css, 'style/' . $f . '.css');
 			if ($f != 'widget') {
@@ -1878,3 +1896,12 @@ class wsHTML5Compiler
 	}
 
 }
+
+if (!function_exists('is_countable')) {
+
+	function is_countable($c)
+	{
+		return is_array($c) || $c instanceof Countable;
+	}
+
+}
diff --git a/inc/ws/Util/html5/master/class.ws.html5.seo.php b/inc/ws/Util/html5/master/class.ws.html5.seo.php
index acb1a5a9b..b1cfd664d 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.seo.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.seo.php
@@ -22,7 +22,7 @@ class wsHTML5Seo
 			$p->title = ($page == 1) ? $this->compiler->book->parametres->title : $this->_getPageLabel($page);
 			$p->text = $this->getTextContent($infos);
 			$p->description = $this->compiler->book->parametres->seoDescription ? $this->compiler->book->parametres->seoDescription : $this->compiler->book->parametres->title . ' - Powered by Fluidbook';
-			$p->socialDescription = $this->compiler->parametres->facebook_description || $this->compiler->book->parametres->seoDescription;
+			$p->socialDescription = $this->compiler->book->parametres->facebook_description || $this->compiler->book->parametres->seoDescription;
 			$p->keywords = $this->compiler->book->parametres->seoKeywords;
 			$p->robots = $this->compiler->book->parametres->seoRobots ? 'index,follow' : 'noindex,nofollow';
 
@@ -82,7 +82,13 @@ class wsHTML5Seo
 				break;
 		}
 
-		$res = trim(file_get_contents(wsDocument::getDir($infos['document_id']) . $prefix . 'h' . $infos['document_page'] . '.txt'));
+		$f = wsDocument::getDir($infos['document_id']) . $prefix . 'h' . $infos['document_page'] . '.txt';
+		if (file_exists($f)) {
+			$res = trim(file_get_contents($f));
+		} else {
+			$res = '';
+		}
+
 		if (strpos($res, '<div>') !== 0) {
 			$res = preg_replace('|\<\/div\>$|', '', $res);
 		}
@@ -97,7 +103,7 @@ class wsHTML5Seo
 			if (trim($chapter->label, "\t\r\n\0\x0B-+") == '') {
 				continue;
 			}
-			if($chapter->page==''){
+			if ($chapter->page == '') {
 				continue;
 			}
 			$p = $this->compiler->virtualToPhysical($chapter->page);
diff --git a/index.php b/index.php
index e82a607f9..ee000b004 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,13 @@
 <?php
-require_once (dirname(__FILE__) . '/vendor/autoload.php');
+set_exception_handler('exception_handle');
+
+
+function exception_handle(Exception $e)
+{
+	error_log(get_class($e) . ' : ' . $e->getMessage() . ' : ' . $e->getFile() . ' at line ' . $e->getLine());
+}
+
+require_once(dirname(__FILE__) . '/vendor/autoload.php');
 require_once(dirname(__FILE__) . '/inc/prepend.php');
 
 ob_start();