* upstream/master:
  update gradle to 4.7 (#4049)
  Add missing translation for "HTML to Unicode" (#4046)
  New Crowdin translations (#4042)
  Use all-text-fields magic also in BibTeX cleanup. (#4039)
  Shortittle bibtexkeypattern now also discards small words (#4030)

* upstream/maintable-beta: (46 commits)
  update gradle to 4.7 (#4049)
  Add missing translation for "HTML to Unicode" (#4046)
  New Crowdin translations (#4042)
  Use all-text-fields magic also in BibTeX cleanup. (#4039)
  Switch to org.postgresql (#4031)
  Fix freeze when importing (#4037)
  Use JavaFX-native SVGPath for logo in About dialog (#4035)
  Remove reflection hack to set WM_CLASS (#4034)
  Fix initial freeze when downloading files
  Inline comment
  Move color related method
  Extract dialog service to field
  Extract dialog service to field
  Remove unused class
  Show tooltip for icon-based columns
  Remove commented-out code
  Convert static methods to instance members (and fix spelling)
  Fix formatting
  Fix formatting
  Remove unused argument
  ...

# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
#	src/main/java/org/jabref/gui/GUIGlobals.java
#	src/main/java/org/jabref/gui/SidePaneComponent.java
#	src/main/java/org/jabref/gui/groups/GroupModeViewModel.java
#	src/main/java/org/jabref/gui/groups/GroupSidePane.java
#	src/main/java/org/jabref/gui/help/AboutDialogView.java
#	src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
#	src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java
#	src/main/resources/l10n/JabRef_en.properties

* upstream/maintable-beta:
  update gradle to 4.7 (#4049)
  Add missing translation for "HTML to Unicode" (#4046)
  New Crowdin translations (#4042)
  Use all-text-fields magic also in BibTeX cleanup. (#4039)
  Shortittle bibtexkeypattern now also discards small words (#4030)