Revert "Added ROI, tested functionality in office"

This reverts commit c80f14f0fbef73658853bdfc13db2251f348caee.

Conflicts:
	ArduCopter/Cape.pde
fixed merge errors