added RobotDrive6 details in Drive Train subsysem and Robot Map.
added commented out line of code for drive6
Merge branch 'origin/master'
Merge branch 'origin/master'

Conflicts:
	src/edu/wpi/first/wpilibj/templates/subsystems/DriveTrain.java