TODO: store strings back to db

TODO: validation

…gsjavafx

* upstream/maintable-beta:
  Save order of columns across sessions (#3783)
  Allow side pane to be completely hidden (#3784)
  Show empty group pane if no database is open (#3785)
  Reenable drag'n'drop support for tabs / libraries (#3688)

…gsjavafx

* upstream/maintable-beta: (188 commits)
  Fix checkstyle
  Exchange Ignore by Disabled (#3912)
  Remove all @author comments and empty method/class comments
  Clean unused imports
  Fix missing icons and wrong package for custom icons
  Consistent FX color scheme for JabRef (#3839)
  javafx replacement for file dialog (#3005)
  Reenable closing of entry preview by pressing Esc (#3883)
  Load all field editors using ViewLoader
  Use JabRef icons in FXML
  Move icon stuff to new package gui.icon
  Load EntryEditor using new ViewLoader
  Improve tooltip tests
  Fix import thread problem
  Don't use null as parameter in DialogService
  Make it easier to create FXML dialogs (#3880)
  update slf4j from 1.8.0-beta1 -> 1.8.0-beta2
  New translations JabRef_en.properties (Tagalog)
  New translations JabRef_en.properties (Italian)
  New translations Menu_en.properties (Italian)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/JabRefFrame.java

…gsjavafx

* upstream/maintable-beta:
  fix checkstyle
  fix closing preferences on save Remove unused code in cleanup No need to set swing content on swing thread

validation icon is now correctly shown, although it needs some css mods
fix toolbar max width

* upstream/master: (583 commits)
  update jfoenix and gradle plugins Replace outdated transformer log4j2 with official new one
  Update journalList.txt
  Fix for Issue #4437 - Some bugs in preference->Entry table columns (#4546)
  Don't set column sort type at startup (#4577)
  Add uncaught exception message (#4565)
  Converts integrity check dialog to JavaFX (#4559)
  Do not extract file ending from Urls (#4547)
  Bump checkstyle from 8.15 to 8.16 (#4562)
  Bump xmpbox from 2.0.12 to 2.0.13 (#4561)
  Delete the deprecated BibEntry Constructor (#4560)
  Refactor BibEntry deprecated method (#4554)
  Added extra stats to be sent with MrDLib recommendations (#4452)
  improve styling of preferences side menu (#4556)
  Cleanup interfaces (#4553)
  Bump fontbox from 2.0.12 to 2.0.13 (#4552)
  Bump pdfbox from 2.0.12 to 2.0.13 (#4551)
  Bump wiremock from 2.19.0 to 2.20.0 (#4550)
  Fixes that renaming a group did not change the group name in the interface (#4549)
  Bump applicationinsights-logging-log4j2 from 2.2.1 to 2.3.0 (#4540)
  Bump antlr4-runtime from 4.7.1 to 4.7.2 (#4542)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/JabRefFrame.java
#	src/main/java/org/jabref/model/entry/BibtexString.java

TODO: Fix buttons not working

* upstream/master:
  Fix overlapping font in id entry type (#4595)

* upstream/master:
  Fix NPE and not on FX Thread in PreviewPrefs Tabs (#4624)
  Fix preview style configuration (#4613)
  Bump wiremock from 2.20.0 to 2.21.0 (#4623)
  snap: disable tests build, add removable media and specify architectures (#4619)
  Bump checkstyle from 8.16 to 8.17 (#4620)
  Fix preferences path: use _JAVA_OPTIONS
  Try to fix not on FX thread for search and autocomplete (#4618)
  Update snapcraft.yaml Move to snap folder
  Convert DuplicateResolverDialog to javafx (#4601)
  Fix for BibTex source tab parsing issue if field contains {} (#4581)
  Convert OO/LO SidePanel to javafx (#4341)
  Convert "Customize importer" dialog to JavaFX (#4608)
  Convert "From Aux file" dialog to JavaFX (#4607)
  Convert "Show preferences" dialog to JavaFX (#4605)
  Fix not on FX thread exception
  Force javafx to run thread (#4604)
  Convert new version dialog to JavaFX (#4602)
  Add a variable to track the change in preview style (#4587)
  Solution for submitting dialog with Ctrl + Enter (#4496) (#4592)
  Bump mysql-connector-java from 8.0.13 to 8.0.14 (#4599)

# Conflicts:
#	src/main/resources/l10n/JabRef_en.properties

TODO: fix validation

optimize layout a bit
fix l10n

* upstream/master:
  Bump mockito-core from 2.23.4 to 2.24.0 (#4626)
  Bump mysql-connector-java from 8.0.14 to 8.0.15 (#4627)

* upstream/master: (21 commits)
  Bump applicationinsights-core from 2.3.0 to 2.3.1 (#4656)
  Bump applicationinsights-logging-log4j2 from 2.3.0 to 2.3.1 (#4657)
  Bump bcprov-jdk15on from 1.60 to 1.61 (#4653)
  Bump log4j-jcl from 2.11.1 to 2.11.2 (#4646)
  Bump log4j-api from 2.11.1 to 2.11.2 (#4650)
  Bump assertj-swing-junit from 3.8.0 to 3.9.2 (#4647)
  Bump log4j-jul from 2.11.1 to 2.11.2 (#4648)
  Bump log4j-slf4j18-impl from 2.11.1 to 2.11.2 (#4649)
  Bump log4j-core from 2.11.1 to 2.11.2 (#4651)
  Remove old code for PDF import (#4634)
  Reorder conditional checks
  Automatically created groups with Field to group by as entrytype (#4539) (#4555)
  Fix for issue 4641: Remove usage of TempDirectory extension from junit-pioneer (#4644)
  Edit localization file
  Add Integrity check for books with edition reported as 1
  Use 'junit-jupiter' aggregator module (#4640)
  Bump junit-jupiter-params from 5.3.2 to 5.4.0 (#4638)
  Bump junit-vintage-engine from 5.3.2 to 5.4.0 (#4637)
  Bump junit-platform-launcher from 1.3.2 to 1.4.0 (#4636)
  Bump junit-jupiter-api from 5.3.2 to 5.4.0 (#4639)
  ...

# Conflicts:
#	src/main/resources/l10n/JabRef_en.properties

fix l10n

add tests