more cleanup
Merge branch 'master' into depthImage

Conflicts:
	ComplexSonar.pde