fixed merge conflict
Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin
Add Motherboard variant 64 - STB V1.1

Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
Add pins for Motherboard variant 64

These definition contain also the definition for the graphics LCD.
Merge pull request #1 from illuminarti/Fix_E_Speed

Fix step rate bug (especially for retraction)
Add command M928 to enable logging to file of received gcode commands
Clean up tab/whitespace from last commit
Merge pull request #411 from STB3/Marlin_w_STB_Board_support

Add STB board support to Marlin (next step towards graphic LCD implementation)
Add Motherboard variant 64 - STB V1.1

Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
Add pins for Motherboard variant 64

These definition contain also the definition for the graphics LCD.
Merge pull request #1 from illuminarti/Fix_E_Speed

Fix step rate bug (especially for retraction)
Adding Maker's Tool Works heated bed thermistor
Removed umwanted HTML code ath the end of the file

Sorry for that. This does not lead to compile errors. I removed the
unwanted code to make it clean.
Add missing LF at the end of the file
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Merge pull request #428 from ryanturner/Marlin_v1

Adding Maker's Tool Works heated bed thermistor
Merge remote-tracking branch 'origin/Marlin_language_file_fix' into GLCD_128x64_dots
Add u8glib library supporting dot matrix displays

https://code.google.com/p/u8glib/
Universal Graphics Library for 8 Bit Embedded Systems
Add Marlin (reprap) specific fonts 6x10, 6x9

Font size 6x10 with feedrate symbol & Font size 6x9.
Reduced u8glib SPI speed to fosc/8

Makes the lib compatible with most LCDs