Merge origin/master

Conflicts:
	AerialAssist/nbproject/project.bak.xml
	AerialAssist/nbproject/project.xml
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/AutoAim.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/CommandBase.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/KickBall.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/MoveBoot.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/StopBoot.java