Add XSS fix to claims
Merge branch 'master' of https://github.com/DecoyDrone/dispatch