Added new board for those of us with sanguinololu boards with ceramic resonators
Added support for Cheaptronic v1 electronic
Merge pull request #675 from forrestg/master

Added support for Cheaptronic v1 electronic
Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs
Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability
Incorporate PS_DEFAULT_OFF for starting state on LCD menu entry
Z and Y dual stepper drivers error

if you try to enable Z_DUAL_STEPPER_DRIVERS the error "You cannot have dual drivers for both Y and Z" shows even if you don't have defined Y_DUAL_STEPPER_DRIVERS and don't let you compile the firmware

to solve this problem i change this line:

#ifdef Z_DUAL_STEPPER_DRIVERS && Y_DUAL_STEPPER_DRIVERS

to:

#if defined (Z_DUAL_STEPPER_DRIVERS) && defined (Y_DUAL_STEPPER_DRIVERS)

now the error only show if you define both Z_DUAL_STEPPER_DRIVERS and Y_DUAL_STEPPER_DRIVERS
Merge pull request #677 from RicardoGA/patch-1

Z and Y dual stepper drivers error
Fixed planner bug
Merge pull request #657 from hcker2000/patch-1

Added new board
Revert "Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs"

This reverts commit b7eadb9f37971a9a2cb0b55a3cca0d013d4e6351.
Merge pull request #676 from IVI053/Marlin_v1

Minor improvements for encoder configuration, LCD entry for PSU controll and thermistor pins on RAMPS
Update Delta example files

Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
Merge pull request #684 from jrbenito/update_delta_config_examples

Update Delta example files
Correct missing parameter from last upmerge

Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
Merge pull request #687 from jrbenito/update_delta_config_examples

Correct missing parameter from last upmerge
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp