Merge remote-tracking branch 'origin/master2'

Conflicts:
	pass_flow/contiki-sky.a
	pass_flow/contiki-sky.map
	pass_flow/pass_flow.sky
	pass_flow_clock/contiki-sky.a
	pass_flow_clock/contiki-sky.map
	pass_flow_clock/pass_flow_clock.c
	pass_flow_clock/pass_flow_clock.sky
version working on z1
set UIP_CONF_BUFFER_SIZE in contiki-2.7/platforms/z1/contiki-conf.h to 240