more re-naming and cleanup
Merge branch 'master' of https://github.com/FRCTeam1073-TheForceTeam/dashboard13

Conflicts:
	SmartDashboard/extensions/RoboRealm_API_Testing.jar