Merge remote-tracking branch 'origin/rf23x' into rf23x-inga

Conflicts:
	apps/webserver-nano/httpd-cgi.c
	cpu/avr/radio/rf230bb/hal.h
	cpu/avr/radio/rf230bb/halbb.c
	cpu/avr/radio/rf230bb/rf230bb.c
	platform/avr-atmega128rfa1/contiki-main.c
	platform/avr-raven/contiki-raven-main.c
[rf23x] Missing fixes for new rf23x driver name