Merge branch 'event'

Conflicts:
	arduino/onboard_controller/onboard_controller.ino
	processing/control_station/SerialThread.pde