fix XSS
Merge branch 'master' of git.freeside.biz:/home/git/freeside