Merge branch 'master' into development

Conflicts:
	libraries/LiquidCrystal/LCD.cpp
	libraries/LiquidCrystal/LCD.h
	libraries/MySensors/MySensor.cpp
	libraries/MySensors/examples/MysensorMicro/MysensorMicro.ino

Author: henrikekblad

hardware/MySensors/avr/boards.txt

@@ -1,5 +1,9 @@
+menu.cpu=Processor
 
-MysensorsMicro.name=Mysensors Micro
+######################################
+## Sensebender Micro
+
+MysensorsMicro.name=Sensebender Micro
 
 MysensorsMicro.upload.tool=arduino:avrdude
 MysensorsMicro.upload.protocol=arduino
@@ -13,10 +17,41 @@ MysensorsMicro.bootloader.lock_bits=0x0F
 MysensorsMicro.bootloader.low_fuses=0xE2
 MysensorsMicro.bootloader.high_fuses=0xD2
 MysensorsMicro.bootloader.extended_fuses=0xFE
-MysensorsMicro.bootloader.file=DualOptiboot/optiboot_atmega328p-pro8.hex
+MysensorsMicro.bootloader.file=DualOptiboot/optiboot_atmega328_pro_8MHz.hex
 
 MysensorsMicro.build.board=AVR_MICRO8
 MysensorsMicro.build.core=arduino:arduino
 MysensorsMicro.build.variant=micro
 MysensorsMicro.build.mcu=atmega328p
-MysensorsMicro.build.f_cpu=8000000L
+#MysensorsMicro.build.f_cpu=8000000L
+
+MysensorsMicro.menu.cpu.8Mhz=Atmega328 8Mhz
+MysensorsMicro.menu.cpu.8Mhz.build.f_cpu=8000000L 
+
+MysensorsMicro.menu.cpu.1Mhz=Atmega328 1Mhz
+MysensorsMicro.menu.cpu.1Mhz.build.f_cpu=1000000L
+
+
+########################################
+## Gateway settings
+
+MysensorsGW.name=Sensebender Gateway
+MysensorsGW.build.core=arduino:arduino
+MysensorsGW.build.variant=GW
+MysensorsGW.build.board=AVR_1284
+MysensorsGW.build.mcu=atmega1284p
+MysensorsGW.build.f_cpu=20000000L
+
+MysensorsGW.upload.tool=arduino:avrdude
+MysensorsGW.upload.protocol=arduino
+MysensorsGW.upload.maximum_size=123720
+MysensorsGW.upload.maximum_data_size=16384
+MysensorsGW.upload.speed=115200
+
+MysensorsGW.bootloader.tool=arduino:avrdude
+MysensorsGW.bootloader.unlock_bits=0x3F
+MysensorsGW.bootloader.lock_bits=0x0F
+MysensorsGW.bootloader.low_fuses=0xE2
+MysensorsGW.bootloader.high_fuses=0xD2
+MysensorsGW.bootloader.extended_fuses=0xFE
+MysensorsGW.bootloader.file=DualOptiboot/optiboot_atmega1284.hex