XSS fix
Merge branch 'patch-20' of https://github.com/gjones2/Freeside
Merge branch 'master' of git.freeside.biz:/home/git/freeside