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

fix typo in delta example config introduced in commit 697ee2d

Fix controller fan

commit 697ee2dc50

With this change a mechanical or optical switch may be used to check the
availability of the filament and when the filament runs out an M600
(filament change) command is issued. This is only done while printing
with an SD card.

This feature was requested several times (issue #679), but the requests
were not accepted since it was believed that this situation should be
handled at host side. However during an SD print the control is totally
on firmware and I think that during an SD print it should be handled by
the firmware.

The original code was posted at reprap forum
(http://forums.reprap.org/read.php?1,297350) by Lazymonk. I have only
corrected some bugs of the code and improved it by adding definitions to
the configuration.h in order to make it more standardized.

- Nonlinear auto bed leveling code (includes G29, G30, Z_RAISE_AFTER_PROBING). Cleaned it up to be a delta-specific AUTO_BED_LEVELING_GRID code path.
- Allen key z-probe deployment and retraction code. Cleaned it up and added safety checks.

- Also update base configs

Latest upstream commits

More sanity-checking for ABL

- Moved sanity-checks to Marlin_main.cpp
- Applied to other configuration files
- Fixed formatting of ABL output
- Passing verbose level to probe_pt
- Miscellaneous cleanup
- Put CONFIG_STEPPERS_TOSHIBA into Configuration.h

Latest upstream changes

Make sure a ROM is selected for ULTRA_LCD

Fixes gCode handling of comments and escaped characters

Fix compile error in gcode_G29

- A redo of #1576, which missed topo_flag
- Always set verbose_level

Minor typos in the README

Undubble MSG_MIN & MSG MAX

add ```^ !(n_ENABLE_ON)``` for each stepper

In-line comments and escaping fixed by foosel

  * "G1 X1 ; test" was not executing "G1 X1" due to never leaving comment mode.
  * "M117 Hello \;)" printed "Hello \" to the display due to not replacing serial_char properly.

Tested with the following commands:
    * M117 Hello ; test => displays "Hello" on display, ignores "test"
    * G1 X1 ; foo => moves 1mm in X, ignores "foo"
    * ; test => completely ignored, not even acknowledged
    * M117 Hello \;) => displays "Hello ;)" on display
    * M117 Hello \\;) => displays "Hello \" on display, ignores ")"

dev pull

Latest upstream changes

Gcode handlers to inline functions

Enhanced G29

Latest upstream changes

Fix autoretract

Autoretract was broken, looks like it was overlooked when the retracted flag was updated for multi extruders.

Sync with upstream