Merge branches 'pull-requests/core-net-bridge-mode', 'pull-requests/core-net-uip-loopback', 'pull-requests/cpu-avr-avrdude-mcu', 'pull-requests/cpu-avr-bootloader', 'pull-requests/cpu-avr-gc-sections', 'pull-requests/cpu-avr-rf230bb-cleanup-hooks', 'pull-requests/cpu-avr-rndis-refactor', 'pull-requests/cpu-avr-usb-cdc-serial-update', 'pull-requests/cpu-native-eeprom', 'pull-requests/cpu-native-osx-route', 'pull-requests/makefiles-uip-conf-ipv6-zero', 'pull-requests/platform-avr-ravenusb-httpd-isused-fix', 'uip-updates', 'pull-requests/platform-econotag-uip-rpl-override', 'pull-requests/settings-for-all-targets' and 'pull-requests/core-net-resolv-bonjour' into bleeding-edge
Merge branch 'pull-requests/platform-avr-ravenusb-leds' into bleeding-edge

Conflicts:
	platform/avr-ravenusb/contiki-conf.h