Merge remote-tracking branch 'origin/master' into 2.1

diff --combined src/Wallabag/CoreBundle/Helper/EntriesExport.php
index 1dfa12c8bf99480e967f40a58be5d4e9fadc4a83,ccf4e4f38e23d4b4df609b5721fe93717e3d7d8d..0c627dcdb6344fa687364d138b2d36bf217ddc89
--- 1/src/Wallabag/CoreBundle/Helper/EntriesExport.php
--- 2/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@@@ -25,7 -25,7 +25,7 @@@ class EntriesExpor
      private $footerTemplate = '<div style="text-align:center;">
          <p>Produced by wallabag with %EXPORT_METHOD%</p>
          <p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p>
-         </div';
+         </div>';
  
      /**
       * @param Config $craueConfig CraueConfig instance to get wallabag instance url from database
@@@ -302,7 -302,7 +302,7 @@@
          $enclosure = '"';
          $handle = fopen('php://memory', 'rb+');
  
 -        fputcsv($handle, ['Title', 'URL', 'Content', 'Tags', 'MIME Type', 'Language'], $delimiter, $enclosure);
 +        fputcsv($handle, ['Title', 'URL', 'Content', 'Tags', 'MIME Type', 'Language', 'Creation date'], $delimiter, $enclosure);
  
          foreach ($this->entries as $entry) {
              fputcsv(
@@@ -315,7 -315,6 +315,7 @@@
                      implode(', ', $entry->getTags()->toArray()),
                      $entry->getMimetype(),
                      $entry->getLanguage(),
 +                    $entry->getCreatedAt()->format('d/m/Y h:i:s'),
                  ],
                  $delimiter,
                  $enclosure