* Initial conflict resolution

All previous items resolved:
- Use of ELAPSED() on timer code
- Switch to use of defer_return_to_status=true as much as possible
- Update & Clean Up of Max7219 routines

* Resolve non-SD case in ultralcd.cpp

* use reduced sized font for some languages

* Fit Portuguese language files to existing scheme

* Rename language_pl-DOGM.h to language_pl_utf8.h

* Rename language_pl_utf8.h to language_pl-DOGM.h

* Update dogm_font_data_ISO10646_1.h

* Update dogm_font_data_ISO10646_1.h

set_destination_to_current() changed to set_destination_from_current()

set_current_to_destination() changed to set_current_from_destination()

* Add M290 babystepping

* Allow `Z` for `M290`

* fix spacing

* Support BABYSTEP_XY in M290

* Not just Z

* Extend M290 for BABYSTEP_ZPROBE_OFFSET

* tweak

[1.1.x] Fix EndStops don't work with BOARD_RAMPS_14_EFB on Micromake C1

Based on #7637 by @marcio-ao

Followup to #8011

+Add French language without accent for japanese LCD

Based on #7975 and #7979

Followup to #7459

Enable change the relative feedrate on a printing job in delta machines with UBL

Changes to support NEOPIXEL LED strips
- Support for different NEOPIXEL as defined in Adafruit_NeoPixel.h
- ability to setup startup brightness
- ability to define sequential/non-sequential transition of color change during heating-up
- additional parameter to M150 P<brightness>

Based on #7447 by @Bob-the-Kuhn

- Original CR-10
- MKS Mini Display