(Nothing has changed that I can remember - just committing so I can pull new changes.)
Merge origin/PickupSubsystem into PickupSubsystem

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/subsystems/PickupSubsystem.java
Merge remote-tracking branch 'origin/PickupSubsystem' into PickupSubsystem
Merge origin/PickupSubsystem into PickupSubsystem
Fixed pickup wheels jag id.
Merge origin/PickupSubsystem into PickupSubsystem

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