multiplatform

Merge remote-tracking branch 'sensorium/master'

# Conflicts:
#	Oscil.h
#	hardware_defines.h