Merge branch 'etx_now_routing' of github.com:fabianbrandt/RIOT into etx_now_routing

Conflicts:
	Makefile.dep
Merge branch 'etx_now_routing' of github.com:fabianbrandt/RIOT into etx_now_routing