bootloader fixes
Merge branch 'master' of https://github.com/pscholl/Arduino

Conflicts:
	hardware/arduino/cores/arduino/Descriptors.h
	hardware/arduino/cores/arduino/DualVirtualSerial.c
	hardware/arduino/cores/arduino/DualVirtualSerial.h
	hardware/arduino/cores/arduino/main.cpp