Added slave friendly names to allow for showing extra agent info
Fixed naming for friendly names, so that I fall inline with other variables in buildbot
Added friendly name to json for buildslaves
Merge branch 'slaveFriendlyName' into staging
Merge branch 'front-end' into staging
Merge branch 'katana' into front-end