More small changes.
Merge origin/master

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/commands/MoveCameraOrArmCommand.java