aa
Merge branch 'master' of https://github.com/CaptFrank/Contiki-Sensor-Node

Conflicts:
	Contiki/contiki-sensor-node-cpp/sensor-drivers/base-i2c-driver.cpp
	Contiki/contiki-sensor-node-cpp/sensor-drivers/base-i2c-driver.h
	Contiki/contiki-sensor-node-cpp/sensor-drivers/i2c-driver.cpp
	Contiki/contiki-sensor-node-cpp/sensor-drivers/i2c-driver.h
	Contiki/contiki-sensor-node/sensor-drivers/i2c-driver.cpp
	Contiki/contiki-sensor-node/sensor-drivers/i2c-driver.h