Merge master2

Conflicts:
	src/edu/wpi/first/wpilibj/templates/RobotMap.java
	src/edu/wpi/first/wpilibj/templates/commands/CrazyDance.java
	src/edu/wpi/first/wpilibj/templates/commands/ReverseTankDrive.java
	src/edu/wpi/first/wpilibj/templates/commands/TankDrive.java
	src/edu/wpi/first/wpilibj/templates/commands/catapult/LauncherManual.java