Toggling the joystick finally finally works, because last time doesn't count.
Merge origin/master

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/RobotTemplate.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/commands/CameraCommand.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/commands/MovePickupArmCommand.java