Updated water and sensor sketches

Added libraries, added xbee functionality and makeshift timestamp
Merge remote-tracking branch 'origin/master'

Conflicts:
	code/arduino_files/sensor_arduino/sensor_arduino.ino
	code/arduino_files/water_arduino/water_arduino.ino