Merge origin/master

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