Final version of speed calibration.
Merge origin/master

Conflicts:
	Robot2014-nonaem/src/edu/wpi/first/wpilibj/templates/FileWriter.java