tightening up XSS vectors
Merge branch 'develop' of https://github.com/xnova/counterwallet into develop