Tried to make it a little intelligent.

Fixed conflicts:
	Marlin/planner.h

fix macro

Delta auto bed level (Updated PR)

The Check Endstop logic must be:

if (current_block->steps_x != current_block->steps_y || (TEST(out_bits,
X_AXIS) == TEST(out_bits, Y_AXIS)))
if (TEST(out_bits, X_HEAD))

not

if (TEST(out_bits, X_HEAD) && (current_block->steps_x !=
current_block->steps_y || (TEST(out_bits, X_AXIS) == TEST(out_bits,
Y_AXIS))))

Same applies for Y axis.

Conflicts:
	Marlin/Marlin_main.cpp

Move TOPO_ORIGIN define to Configuration.h

- Addressing issue #1608

Fix #1611

Fix for #1612

Warning: suggest parentheses around comparison in operand of &

pretty much helped.

Added support for Felix 2.0/3.0 printers

Configurator utility

M404 should not use 'N' address as parameter because 'N' is reserved

Fix controllerFan() code

- Add support for 4th extruder
- Fix parentheses matching
- Apply coding standards
- Address issue mentioned at #1575

Latest upstream changes

Cleanup of stepper.cpp

Update ultralcd_st7920_u8glib_rrd.h

Filament Runout Sensor Feature

Simplify manage_heater

- Add BIT and TEST macros
- Add _APPLY_ macros to stepper.cpp to help with consolidation
- Consolidate code in stepper.cpp using macros
- Apply standards in stepper.cpp
- Use >= 0 instead of > -1 as a better semantic
- Replace DUAL_Y_CARRIAGE with Y_DUAL_STEPPER_DRIVERS