Conflicts:
	Marlin/Marlin_main.cpp

Move TOPO_ORIGIN define to Configuration.h

- Compare pr_char to space
- Fewer calls to lcd_strlen

- Get rid of _selected functions, passing selected state instead

- 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

- Make separate get_pid_output(e) and get_pid_output_bed() function
- Reduce size of manage_heater function
- Hopefully work around linker errors

Latest upstream

Fix missing temp_error declarations

- Fix for #1591 replacing #1595

Conflicts:
	Marlin/Configuration.h

Macro indirection for stepper drivers + Support for TMC26X and L6470 Stepper Drivers

update

The max acceleration limiting was in wrong place.

Added option to set Travel Acceleration (non printing moves).
The M204 options was a non sense (S for printing moves and T for retract
moves).

It has been changed to:
P = Printing moves
R = Retract only (no X, Y, Z) moves
T = Travel (non
printing) moves

I will add this info o G-Code wiki in reprap.org. I also advise to put
this info in Marlin next version changelog.

I forgot to enclousure the variable with #ifdef

removed the link as the software i had did not work, nor does anyone hardly use irc chat but just hang out there

Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp

fix a handful of cases where strtod() was cast to int, instead of just using strtol()

update