Add quad damage
Merge branch 'master' into voting