Added Solenoid control for Shifters
Merge origin/master

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