Revert "stable for rolls 10/25/14"

This reverts commit 488f6e0a9a3d563741eedb485eae9d7405e712d9.

Conflicts:
	surface_src/java_src/Alice/src/com/roboclub/robobuggy/sensors/VisionSystem.java
	surface_src/java_src/Alice/src/com/roboclub/robobuggy/ui/ControlPanel.java