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
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 '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
Fixed config page defaults