Fixed the else if ladder
Merge origin/master

Conflicts:
	FRC3157/src/edu/wpi/first/wpilibj/templates/FRCConfig.java