merge
Merge branch 'master' of https://github.com/ligerbots/AerialAssist2014Robot into wpi

Conflicts:
	src/org/usfirst/frc2877/AerialAssist2014Robot/commands/AutonomousCommand.java
Changes at WPI Thursday competition.
Changes at WPI Thursday competition.
Remove the manual turn buttons.
Stop Compressor in teleop and fix auto turn speed
Stop Compressor in teleop and fix auto turn speed