Merge origin/master
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
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