Updated FriendlyName to remove possible duplicate friendly names.
Merge origin/master

Conflicts:
	robotFiles/allRoutes.txt