mvsb - safe html escape and escape ? for regex
Merge branch 'master' of https://github.com/spiffyui/spiffyui
Merge branch 'master' of https://github.com/spiffyui/spiffyui