Smartdashboard stuff.
Merge origin/master

Conflicts:
	src/org/usfirst/frc3528/UpNext2014Robot/commands/DriveWithJoystick.java

changed camera settings.
Merge origin/master
Merge origin/master

Changed camera settings.