* upstream/master: (30 commits)
  Add preference migration for keybdingings (#3007)
  Shutdown previus AutosaveManager and BackupManager during SaveAs  (#2994)
  Run Checkstyle task after Test task (#3010)
  Mark LibraryOfCongressTest as a fetcher test (#3012)
  When browsing through the MainTable remember which EntryEditor tab was open (#3011)
  Improve performance of journal abbreviation loader (#3009)
  Update checkstyle 7.6.1 -> 8.0
  Don't abort build when there are checkstyle violations (#3006)
  Reimplement content selectors (#3003)
  Only do a back up for bigger changes or if a different field is edited (#3004)
  Listen to change events for setting dirty status of database (#3001)
  Fix #2967: MathSciNet tab works again
  Fix #2902: Tab in entry editor moves to next text area
  Fix #2946: external changes are now correctly shown in the entry editor
  Fix #2998: improve auto completion (#3002)
  Fix mac keybinding by replacing ctrl it with meta key (#3000)
  Less backups (#2995)
  [WIP] Complete rework of the auto completion (#2965)
  Eclipse J
  Add switch indentation for Eclipse and add some new missing formatting options
  ...

* upstream/master: (41 commits)
  update xmlunit from 2.3.0 -> 2.4.0
  update wiremock from 2.6.0 -> 2.7.0
  update controlsfx from 8.40.12 -> 8.40.13
  Fix group freeze by running markBasechange in swing thread (#3058)
  Localization: French: translation of new entries (#3050)
  Fix ads fetcher (#3048)
  Update translation (#3041)
  Translate new strings (#3040)
  Fix navigation in entry editor increases modifies font size (#3037)
  Initial idea for architectural decision records (#3033)
  Readd comment
  Readd comment
  Fix keybdining in entry editor in localized installation (#3030)
  Structuring
  Upgrade shadowJar
  Modernizer improvements
  Replace Reimplement MappedList.kt (#3032)
  Use https for the maven ej-technologies repo
  Upgrade modernizer plugin
  Remove separator next to search bar
  ...

* upstream/master:
  Add warning message if group with same name is already present (#3077)
  Fix #3062: Ctrl + F works again
  Fix del/copy/paste key trigger main table action in search bar (#3070)
  Fix markdown
  Update gradle from 4.0.1 to 4.0.2
  Fix #3045 Update Transformer plugin
  Reimplement MappedList using a backigList (#3069)
  Fix importing preferences after resetting without restarting (#3065)
  Fix some spotbugs issues (#3060)
  Import dialog when fetch (#3025)
  Adapt CircleCI build
  Adapt CI script
  Closes #3027 and updates install4j to v7

open dialog with attach file action

* upstream/master: (188 commits)
  Show file description only if not empty
  Add file description to gui and fix sync bug (#3210)
  Don't highlight odd rows in file list editor (#3223)
  Fix assertion by removing typo (#3220)
  Update assertion to change of online reference (#3221)
  Put in null return
  Reformatted code, renamed method, added try/catch
  Add tests for removal changes
  Improve telemetry (#3218)
  Real test linking real other entry (#3214)
  Check for explicit group at different location
  Update java-string-similarity from 0.24 -> 1.0.0
  Only remove ExplicitGroups from entries, but not keyword-based groups
  Localization: French: Translation of a new string (#3212)
  Fix null return
  Changed from Path to Optional<Path>
  Fix #2775: Hyphens in last names are properly parsed (#3209)
  Followup to Issue #3167 (#3202)
  Remove unused import in GroupTreeNode
  Move getEntriesInGroup to GroupTreeNode
  ...

* upstream/master: (79 commits)
  Update richtext and flowless (#3386)
  Source tab: hide notification pane when code is correct again (#3387)
  Titles are optional at crossref (#3378)
  Update entry for every change in the source panel (#3366)
  Rework AutoSetFileLinks (#3368)
  revert wrongly commited changes
  Refactorings (#3370)
  Fix freezing when running cleanup file operations like rename (#3315)
  This additional style setting for IDEA (#3355)
  Fix checkstyle
  Add proper equals to content selector
  Source tab entry duplication (#3360)
  Use CITE_COMMENT not only for external latex editors but also for cop… (#3351)
  Updating with new translations (#3348)
  Upgrade error-prone (#3350)
  Jabref_pt_BR partially updated (#3349)
  Delete unused code
  Extract difference finder from gui to logic
  Used late initialization for context menus (#3340)
  Fix NPE when calling with bib file as cmd argument (#3343)
  ...

* upstream/master:
  Improve SyncLang.py (#3184)
  Config intellj code style to adhere to empty lines checkstyle rule (#3365)
  Don't list same look and feels more than once (#3393)
  progessdialog and result table are now shown correclty on copy files
  Export pdf/linked files  (#3147)
  Added checking integrity dialog (#3388)

* upstream/master: (30 commits)
  Add Hint for checking master version (#3439)
  Replace LinkedFiles backslashes with forward slashes (#3403)
  fix isbn result from chimbori (#3442)
  Feature java version check again (#3428)
  Fix test for quoted lang messages (#3424)
  Update gradle from 4.3 to 4.3.1
  Fix #3411: ordering of fields in customized entry types works again (#3422)
  Backport of syncLang to python2 (#3420)
  Remove Versioneye badge
  Fix some error prone warnings
  Fix for issue #2721 append to a field (#3395)
  Fix travis - hopefully
  Remove 3.x changelog (#3250)
  Try to use hint of https://github.com/TheBoegl/shadow-log4j-transformer#usage-as-library
  Try to enable LGTM
  Update guava from 23.2 -> 23.3 (#3409)
  Update wiremock from 2.8.0 -> 2.10.1
  Move groups field from others to general (#3407)
  Fix checkstyle issues to repair build
  Fix #3046: No longer allow duplicate fields in customized entry types (#3405)
  ...

* upstream/master: (234 commits)
  Fix checkstyle
  Fix tests
  Fix fetcher tests (#3583)
  Convert entry preview panel to JavaFX (#3574)
  Remove dependency for JUnit4 (#3580)
  Update tracis cache config as recommned by the docs (#3575)
  fix typo
  Show development information
  Release v4.1
  Add new authors to mailMap (#3567)
  Fix build
  Really fix changelog
  Fix changelog
  Minor changes
  Disable the autocompletion as default (#3569)
  Add update exception for applicationinsights 2.0.0-BETA (#3571)
  Install4j jres 152 (#3570)
  Fix grammar mistake
  Downgrade applicationinsights. Fixes #3561
  Adapt scripts/prepare-install4j.sh to JRE1.8.0_152 (#3568)
  ...

* upstream/master:
  Remove dependency to jgoodies-looks (#3458)
  Add simple gui test (#3399)
  Library properties: no change but.. (issue #3562) (#3579)
  Initialize previe before MainPanel to prevent NPEs on delete Fixes #3584

* upstream/master:
  Refactor shared package into the architecture (#3523)

* upstream/master:
  Add oaDOI fulltext fetcher (#3581)
  Refactor export code to fix #3576 (#3578)
  Fix #3359: Automatically remove colon and apostrophe from key pattern (#3506)

* upstream/master: (71 commits)
  New translations JabRef_en.properties (French)
  Add Gitter badge and hint (#3630)
  New translations JabRef_en.properties (Vietnamese)
  New translations JabRef_en.properties (Chinese Simplified)
  New translations JabRef_en.properties (Dutch)
  New translations JabRef_en.properties (French)
  New translations JabRef_en.properties (German)
  New translations JabRef_en.properties (Greek)
  New translations JabRef_en.properties (Indonesian)
  New translations JabRef_en.properties (Italian)
  New translations JabRef_en.properties (Japanese)
  New translations JabRef_en.properties (Norwegian)
  New translations JabRef_en.properties (Persian)
  New translations JabRef_en.properties (Portuguese, Brazilian)
  New translations JabRef_en.properties (Russian)
  New translations JabRef_en.properties (Spanish)
  New translations JabRef_en.properties (Swedish)
  New translations JabRef_en.properties (Turkish)
  New translations JabRef_en.properties (Danish)
  Update CHANGELOG.md
  ...

* upstream/master: (46 commits)
  Replace openoffice jars with libreoffice  jars (#3662)
  Export no empty lines in RIS format (#3661)
  Remove apache commons logging in favor of slf4j + log4j for JAVA 9 (#3653)
  fix isbn fetcher test as Joshua Bloch has published a new revivsion of Effetive Java convert to junit5 jupiter
  Extend RIS import with multiple fields (#3642)
  Fix ICAR fetcher test which resulted in build failure (#3654)
  New translations JabRef_en.properties (French) (#3650)
  Add link to MADR and fix typo
  [WIP] Add "Convert to BibTeX format" cleanup (#3541)
  Fix typo
  Fix typo
  Quickfix to get build running on all platforms (#3638)
  New translations JabRef_en.properties (French)
  New translations JabRef_en.properties (Vietnamese)
  New translations JabRef_en.properties (Chinese Simplified)
  New translations JabRef_en.properties (Dutch)
  New translations JabRef_en.properties (French)
  New translations JabRef_en.properties (German)
  New translations JabRef_en.properties (Greek)
  New translations JabRef_en.properties (Indonesian)
  ...

…esDlg

* upstream/maintable-beta: (346 commits)
  add missing localization
  fix keybinding of entry editor add missing keybinding of search
  Update java-string-similarity from 1.0.1 -> 1.1.0
  Update log4j from 2.10.0 -> 2.11.0
  Update guava from 24.0 -> 24.1
  New Crowdin translations (#3853)
  Fetcher refactorings
  Fix ScienceDirect fetcher #3854
  Fix Google Scholar fetcher test
  Fix DBLP fetcher tests
  Move migration to top level package
  New Crowdin translations (#3851)
  Update Eclipse style to intellij style (#3827)
  fix some not on fx thread dialogs in preferences
  fix inital save error Convert last dialog to javafx refactor exception
  Update mysql-connector from 5.1.45 -> 5.1.46
  Update mockito-core from 2.15.0 -> 2.16.0
  New translations JabRef_en.properties (Spanish)
  New translations Menu_en.properties (Spanish)
  Merge changes for renamed actions
  ...

* upstream/master:
  Provides download option in context menu and fixes #3614 (#3824)
  Minor refactoring

# Conflicts:
#	src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
#	src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
#	src/test/java/org/jabref/architecture/TestArchitectureTests.java
#	src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java

TODO: what do to on edit? How to save the new file?

update File after Edit

convert ImportInspectionDialog to use new file edit dialog

…esDlg

* upstream/maintable-beta:
  Get rid of journal abbrev loader in linkedFiles (#3862)
  fix build, remove layout prefs, pass journal abbrev loader and prefs where necessary
  Watch main css file for change and reapply automatically (#3847)
  Provides download option in context menu and fixes #3614 (#3824)
  Minor refactoring

# Conflicts:
#	src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java

show file open dialog on attach file
show dialog for editing file afterwards

Pass Preferences Service instead of Preferences

…esDlg

* upstream/maintable-beta:
  fix failing tests in maintable beta (#3863)

remove unused parameter entry

Move fxml to resources
rework layout to grid

…esDlg

* upstream/maintable-beta: (35 commits)
  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)
  New translations JabRef_en.properties (Indonesian)
  New translations JabRef_en.properties (Greek)
  New translations Menu_en.properties (Greek)
  New translations JabRef_en.properties (Japanese)
  New translations JabRef_en.properties (German)
  New translations JabRef_en.properties (Dutch)
  New translations JabRef_en.properties (Danish)
  New translations JabRef_en.properties (Chinese Simplified)
  ...

# Conflicts:
#	CHANGELOG.md
#	src/main/java/org/jabref/gui/AbstractView.java
#	src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
#	src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
#	src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
#	src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java

still some NPEs

move fxml to java package
remove wrapper class
pass externalFileType to viewModel
renammings

Add ok button to dialog pane

…esDlg

* upstream/maintable-beta:
  Reenable closing of entry preview by pressing Esc (#3883)

# Conflicts:
#	src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java