Added additional captcha checks - google and number based
Merge branch 'master' into frodo