Xss fix for bootstrap3 branch
Merge pull request #717 from forced-request/bootstrap3

Xss fix for bootstrap3 branch