update branch to master
Merge branch 'sensorDev'

Conflicts:
	arduinoSketches/bmp085/bmp085.ino
merge with sensorDev