Merge branch 'master' into dev

MarlinKimbra/Boards.h

@@ -25,8 +25,8 @@
 
 #define BOARD_DUEMILANOVE_328P  4    // Duemilanove w/ ATMega328P pin assignments
 #define BOARD_RADDS             402  // RADDS ARM 32
-#define BOARD_RAMPS_FDV1        403  // RAMPS-FD V1 ARM 32
-#define BOARD_RAMPS_FDV2        404  // RAMPS-FD V2 ARM 32
+#define BOARD_RAMPS_FD_V1       403  // RAMPS-FD V1 ARM 32
+#define BOARD_RAMPS_FD_V2       404  // RAMPS-FD V2 ARM 32
 #define BOARD_SMART_RAMPS       408  // SMART RAMPS ARM 32
 #define BOARD_RAMPS4DUE         433  // RAMPS4DUE with AndrewBCN's RAMPS mods (http://forums.reprap.org/read.php?219,479626,page=1) ARM 32