* 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

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

+Add French language without accent for japanese LCD