Now defaults to using z1-feshie platform
Merge branch 'driver-tweaks' into mountain-sensing
Disabled always on mode for border router
added simple rpl border router to mountain sensing
Merge branch 'mountain-sensing' into z1-sampler-fixes

Conflicts:
	mountainsensing/rpl-border-router-improved/border-router.c