Conflicts:
	Marlin/Marlin_main.cpp

Update #413 for merging, fix languages.h

Some strings still need translation, but at least everything compiles.

Conflicts:
	Marlin/language.h

Fixed compile error when QUICK_HOME is defined.

As well a couple of minor changes to handling of extruder offset for
dual x-carriage mode.

Disable DUAL_X_CARRIAGE by default

Dual x-carriage support

Also added a couple of missed merge lines in homeaxis() from previous
commit.

disable delta by default

add more delta defaults
on delta make second home even slower

Dual x-carriage designs offer some substantial improvements for dual
extruder printing.

fixed bad lcd commit from makr3d

#elsif does not exist #elif is correct

Untested

M109 S180 waits only when heating.
M109 R180 also waits when cooling.

Only clamp panel movements if software endstops are enabled

Update language.h

I update the spanish Messages, now this compile for spanish language.

Fixes compiler warning for feedrate deadzone

Fix for ugly code compilation errors in SERVO_ENDSTOP checks

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/ultralcd.cpp

Fix Pin Description Typo

Reverse 'Bed' and 'Fan' at the RAMPS 33 Description.

Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>

ultralcd.cpp compile errors when !defined(PIDTEMP)

added Azteeg X1 motherboard

Makefile fixes