Fixed auto generation of regex
Merge branch 'master' of https://github.com/phyzical/webannotator2013