Buff scout health
Merge branch 'refs/remotes/origin/master'
Fix a conflict
Hats and shadow step
Team colours init
Team colours init