unorganized foobar
Merge branch 'decouple_network_stack' into tmp-merge-pr-644-740

Conflicts:
	sys/net/network_layer/sixlowpan/mac.c