Merge branch 'backpack5' into quiz3

# Conflicts:
#	resources/linkeditor/js/linkeditor.js

diff --cc resources/linkeditor/js/linkeditor.js
Simple merge

diff --cc resources/views/fluidbook_publication/link_editor.blade.php
index ea97c860e111c1574378c1cf9c13510b1bc5e892,0f9f8db802dbac59dbfa51f0cd28edfc1e8e39bf..170f6725549ef954f303710715a2b2b2e8e5cfa4
--- 1/resources/views/fluidbook_publication/link_editor.blade.php
--- 2/resources/views/fluidbook_publication/link_editor.blade.php
+++ b/resources/views/fluidbook_publication/link_editor.blade.php
@@@ -141,15 -137,12 +141,16 @@@
  
  @section('content')
      @include('fluidbook_publication.link_editor_icons')
 +    <div id="token" data-token="{{$token}}"></div>
 +    @isset($connexionInfo)
 +        <div id="token-cache" data-token="{{$connexionInfo['token']}}"></div>
 +    @endisset
 +    <div id="userID" data-id="{{backpack_user()->id}}"></div>
      <div id="popup-overlay">
          <div id="popup-holder">
 -
          </div>
      </div>
+     <div id="loader"></div>
      <div id="popup-templates">
          <div class="popup" data-popup="moveLinks" style="max-width: 300px">
              <h2>{{__('Déplacer les liens')}}</h2>