some xss fixes
Merge branch 'master' of https://github.com/nbhansali/cyclos_secure