Merge remote-tracking branch 'origin/punktetool' into punktetool

mockup/fabric.html

@@ -35,7 +35,9 @@
             </div>
         </div>
     </div>
+    <!-- remove this
     <img src="mockData/Scan2a.jpeg" class="qfq-fabric-image" id="qfq-fabric-image-1"> </img>
+    -->
 
     <div class="row">
         <div class="col-md-4">
@@ -43,7 +45,8 @@
             <div class="fabric"
                  data-buttons="mockData/fabric.buttons.json"
                  data-emojis="mockData/qfq.emoji.json"
-                 data-control-name='fabric-output'>
+                 data-control-name='fabric-output'
+                 data-background-image="mockData/Scan2a.jpeg">
             </div>
             <input id="fabric-output" name="fabric-data" type="hidden">