Changes motion to do local odometry-based navigation (still testing)
Fixes a motion bug, adds a temp change for testing
Merge branch 'master' of github.com:rss-2014-team-6/rss-team-6-motion

Conflicts:
	src/main/java/motion/Motor/RobotPositionController.java