Modified player colors so that it is easy to set scans
Merge remote-tracking branch 'origin/master'