Merge origin/master

Conflicts:
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/AutoDrive.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/Autonomous.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/KickBall.java
Deleted Autonomous left and right auto-aims and instead one auto-aim command will be used in both Auto and Teleop.