aes-test
added temperature/humidity resource to erbium example
removed a printf
shrinked border-router
style
reduced required rom of the simple-udp-rpl example
disabled tcp/udp on border router
disabled tcp in simple-udp-rpl
disabled tcp in er-rest-example
Merge branch 'master' of git://github.com/contiki-os/contiki into experiments
nullrdc in slip-radio
Merge branch 'master' of git://github.com/contiki-os/contiki into experiments
Merge branch 'master' of git://github.com/contiki-os/contiki into experiments
Merge branch 'master' into experiments

Conflicts:
	examples/er-rest-example/er-example-server.c
	examples/er-rest-example/project-conf.h
Merge branch 'master' of git://github.com/contiki-os/contiki into experiments
blom
GF(2^32+1)
performance GF(0x100000001)
+1 tests
Merge branch 'master' of git://github.com/contiki-os/contiki into experiments