fixed path for make file
Fixed coffee arch size definitions to allow for use of reset counter
Merge branch 'driver-tweaks' into z1-sampler-fixes
added node reset script
inow does correct mac init foo
Merge branch 'mountain-sensing' into z1-sampler-fixes

Conflicts:
	mountainsensing/rpl-border-router-improved/border-router.c
Merge remote-tracking branch 'origin/rssi-fix' into mountain-sensing
Fixed so that the z1 platform can be compiled again
 Now at 9600 baud
Reverted some cc1120 driver changes in a debugging effort.
Z1-Sampler partially working with CC1120
Merge remote-tracking branch 'origin/z1-sampler-fixes' into HEAD

Conflicts:
	mountainsensing/rpl-border-router-improved/border-router.c
Fixed bug with POSTing and added config defines
Merge branch 'z1-sampler-improved' into mountain-sensing
Merge branch 'driver-tweaks2' into mountain-sensing

Conflicts:
	platform/z1-feshie/dev/cc1120.c
Fixes #7 Changed driver to latest driver-tweaks2 version
Set channel BACK to 42 (868.250MHz)
Set Border routers BACK to keeping the radio on rather than using RDC.
Merge branch 'mountain-sensing' of https://github.com/feshie/contiki into mountain-sensing

Conflicts:
	mountainsensing/rpl-border-router-improved/border-router.c
Added AVR stub for sampling - needs implementing