Merge origin/master

Conflicts:
	src/edu/wpi/first/wpilibj/paradigm/AdventureRick.java
Revert "Merge origin/master"

This reverts commit 1d45c6bbfea1cbfdcdad9673e4cec4d2a98be26c.
Merge origin/master

Conflicts:
	src/edu/wpi/first/wpilibj/paradigm/AdventureRick.java
Merge origin/master

Conflicts:
	src/edu/wpi/first/wpilibj/paradigm/AdventureRick.java