Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

diff --cc Marlin/Configuration.h
index 722cb9642df10f0e3c6bb250faed7361cf34381e,1c77733039dec44b6557f5c3a289ed3297dd6342..d417d415cffad143da6405d33b79196c97d2e27d
--- 1/Marlin/Configuration.h
--- 2/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@@ -58,14 -59,13 +59,13 @@@ const bool ENDSTOPS_INVERTING = true; /
  
  // #define ULTRA_LCD  //any lcd 
  
- #define ULTIPANEL
  #define ULTIPANEL
  #ifdef ULTIPANEL
 - //#define NEWPANEL  //enable this if you have a click-encoder panel
 - #define SDSUPPORT
 - #define ULTRA_LCD
 - #define LCD_WIDTH 20
 -#define LCD_HEIGHT 4
 +  //#define NEWPANEL  //enable this if you have a click-encoder panel
 +  #define SDSUPPORT
 +  #define ULTRA_LCD
 +  #define LCD_WIDTH 20
 +  #define LCD_HEIGHT 4
  #else //no panel but just lcd 
    #ifdef ULTRA_LCD
      #define LCD_WIDTH 16

diff --cc Marlin/Marlin.pde
Simple merge