Merge remote-tracking branch 'origin/master'

src/main/java/ieven/server/webapp/domain/exporter/Exporter.java

@@ -133,7 +133,7 @@ public class Exporter {
         if (file1.exists()) {
             file1.delete();
         }
-        String filePath = this.generateCsv(fields, filename, tmpdir, cursor);
+        String filePath = this.generateFile(fields, filename, tmpdir, cursor);
         FileInputStream inputStream = new FileInputStream(filePath);
         ObjectId objectId = gridFsTemplate.store(inputStream, filename);
         inputStream.close();