Merge Network code with webserver etc
Add some re entrancy fixes to circbuffer and ringbuffer
Allow network to be eliminated from build with make NONETWORK=1
Merge pull request #295 from wolfmanjm/feature/uip-network-webserver

Merge Network code with webserver etc
Merge remote-tracking branch 'upstream/edge' into working

Conflicts:
	src/modules/utils/simpleshell/SimpleShell.cpp