Merge origin/master

Conflicts:
	AerialAssist/nbproject/private/private.xml
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/KickBall.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/commands/LowerArm.java
	AerialAssist/src/edu/wpi/first/wpilibj/templates/subsystems/Boot.java